rc script clean up

openldap/openldap.spec

@@ -33,7 +33,7 @@ Distribution: OpenPKG [PLUS]
 Group:        Database
 License:      GPL
 Version:      2.1.16
-Release:      20030324
+Release:      20030328
 
 #   package options
 %option       with_sasl no
@@ -104,6 +104,7 @@ AutoReqProv:  no
     %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/var/openldap
     %{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.openldap} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
     %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
         %{l_files_std} \

openldap/rc.openldap

@@ -6,15 +6,15 @@
 %config
     openldap_enable="yes"
 
-%start -p 200 -u root
+%start -p 200 -u @l_susr@
     opServiceEnabled openldap || exit 0
     @l_prefix@/libexec/slapd
 
-%stop -p 200 -u root
+%stop -p 200 -u @l_susr@
     opServiceEnabled openldap || exit 0
     kill -INT `cat @l_prefix@/var/openldap/slapd.pid`
 
-%restart -u root
+%restart -u @l_susr@
     opServiceEnabled openldap || exit 0
     kill -INT `cat @l_prefix@/var/openldap/slapd.pid`
     sleep 2

uucp/rc.uucp

@@ -21,15 +21,15 @@
         fi
     }
 
-%start -p 200 -u root
+%start -p 200 -u @l_susr@
     opServiceEnabled uucp || exit 0
     uucp_start
 
-%stop -p 200 -u root
+%stop -p 200 -u @l_susr@
     opServiceEnabled uucp || exit 0
     uucp_stop
 
-%restart -u root
+%restart -u @l_susr@
     opServiceEnabled uucp || exit 0
     uucp_stop
     uucp_start

uucp/uucp.spec

@@ -33,7 +33,7 @@ Distribution: OpenPKG [BASE]
 Group:        Communication
 License:      GPL
 Version:      1.06.1
-Release:      20021111
+Release:      20030328
 
 #   list of sources
 Source0:      ftp://ftp.gnu.org/gnu/uucp/uucp-%{version}.tar.gz
@@ -107,6 +107,7 @@ AutoReqProv:  no
         etc/* $RPM_BUILD_ROOT%{l_prefix}/etc/uucp/
     %{l_shtool} install -c -m 755 \
         -e 's;@l_prefix@;%{l_prefix};g' \
+        -e 's;@l_susr@;%{l_susr};g' \
         %{SOURCE rc.uucp} \
         $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
     %{l_shtool} install -c -m 644 /dev/null \

vrrpd/rc.vrrpd

@@ -6,11 +6,11 @@
 %config
     vrrpd_enable="yes"
 
-%start -p 200 -u root
+%start -p 200 -u @l_susr@
     opServiceEnabled vrrpd || exit 0
     @l_prefix@/sbin/vrrpd >/dev/null 2>&1
 
-%stop -p 200 -u root
+%stop -p 200 -u @l_susr@
     opServiceEnabled vrrpd || exit 0
     /usr/bin/killall vrrpd >/dev/null 2>&1
 

vrrpd/vrrpd.spec

@@ -35,7 +35,7 @@ Distribution: OpenPKG [JUNK]
 Group:        Networking
 License:      BSD
 Version:      0.8.6
-Release:      20030310
+Release:      20030328
 
 #   list of sources
 Source0:      http://www.bsdshell.net/download/freevrrpd-%{version}.tar.gz
@@ -94,6 +94,7 @@ AutoReqProv:  no
         %{SOURCE vrrpd.conf} $RPM_BUILD_ROOT%{l_prefix}/etc/vrrpd/
     %{l_shtool} install -c -m 755 \
         -e 's;@l_prefix@;%{l_prefix};' \
+        -e 's;@l_susr@;%{l_susr};g' \
         %{SOURCE rc.vrrpd} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
     %{l_shtool} install -c -m 644 \
         -e 's;@l_prefix@;%{l_prefix};' \

zebra/rc.zebra

@@ -7,7 +7,7 @@
     zebra_enable="yes"
     zebra_protocols="rip ospf bgp"
 
-%start -p 200 -u root
+%start -p 200 -u @l_susr@
     opServiceEnabled zebra || exit 0
     ( cd @l_prefix@/etc/zebra
       @l_prefix@/sbin/zebra -d
@@ -19,7 +19,7 @@
       @l_prefix@/bin/vtysh -b
     )
 
-%stop -p 200 -u root
+%stop -p 200 -u @l_susr@
     opServiceEnabled zebra || exit 0
     if [ -f @l_prefix@/var/zebra/zebra.pid ]; then
         kill -TERM `cat @l_prefix@/var/zebra/zebra.pid` >/dev/null 2>&1 || true

zebra/zebra.spec

@@ -33,7 +33,7 @@ Distribution: OpenPKG [BASE]
 Group:        Network
 License:      GPL
 Version:      0.93b
-Release:      20030312
+Release:      20030328
 
 #   list of sources
 Source0:      ftp://ftp.zebra.org/pub/zebra/zebra-%{version}.tar.gz
@@ -117,6 +117,7 @@ AutoReqProv:  no
         $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.zebra} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
 
     #   make sure pid and log directory exists