clean up

dhcpd/dhcpd.spec

@@ -33,7 +33,7 @@ Distribution: OpenPKG [BASE]
 Group:        DNS
 License:      ISC/BSD
 Version:      3.0.1rc11
-Release:      20030408
+Release:      20030501
 
 #   list of sources
 Source0:      ftp://ftp.isc.org/isc/dhcp/dhcp-%{version}.tar.gz
@@ -106,6 +106,7 @@ AutoReqProv:  no
     %{l_shtool} mkdir -f -p -m 755 \
         $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d
     %{l_shtool} install -c -m 755 -e 's;@l_prefix@;%{l_prefix};g' \
+        -e 's;@l_susr@;%{l_susr};g' \
         %{SOURCE rc.dhcpd} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
     %{l_shtool} install -c -m 644 /dev/null \
         $RPM_BUILD_ROOT%{l_prefix}/var/dhcpd/dhcpd.leases

dhcpd/rc.dhcpd

@@ -6,21 +6,21 @@
 %config
     dhcpd_enable="yes"
 
-%start -p 200 -u root
+%start -p 200 -u @l_susr@
     opServiceEnabled dhcpd || exit 0
     @l_prefix@/sbin/dhcpd >/dev/null 2>&1
 
-%stop -p 200 -u root
+%stop -p 200 -u @l_susr@
     opServiceEnabled dhcpd || exit 0
     kill -TERM `cat @l_prefix@/var/dhcpd/dhcpd.pid`
 
-%restart -u root
+%restart -u @l_susr@
     opServiceEnabled dhcpd || exit 0
     kill -TERM `cat @l_prefix@/var/dhcpd/dhcpd.pid`
     sleep 2
     @l_prefix@/sbin/dhcpd >/dev/null 2>&1
 
-%reload -u root
+%reload -u @l_susr@
     opServiceEnabled dhcpd || exit 0
     kill -HUP `cat @l_prefix@/var/dhcpd/dhcpd.pid`