SPECS: util-vserver.spec - use %service

[glen]

Author: glen                         Date: Wed Mar  1 21:24:39 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use %service

---- Files affected:
SPECS:
   util-vserver.spec (1.106 -> 1.107) 

---- Diffs:

================================================================
Index: SPECS/util-vserver.spec
diff -u SPECS/util-vserver.spec:1.106 SPECS/util-vserver.spec:1.107
--- SPECS/util-vserver.spec:1.106	Wed Mar  1 22:01:02 2006
+++ SPECS/util-vserver.spec	Wed Mar  1 22:24:33 2006
@@ -48,6 +48,7 @@
 %ifarch %{x8664}
 BuildRequires:	sed >= 4.0
 %endif
+BuildRequires:	rpmbuild(macros) >= 1.268
 %if %{with doc}
 BuildRequires:	doxygen
 BuildRequires:	graphviz
@@ -409,26 +410,20 @@
 /sbin/chkconfig --add vprocunhide
 /sbin/chkconfig --add vservers
 if [ ! -f /var/lock/subsys/vrootdevices ]; then
-	echo "Type \"/etc/rc.d/init.d/vrootdevices start\" to assign virtual root devices" 1>&2
+	echo "Type \"/sbin/service vrootdevices start\" to assign virtual root devices" 1>&2
 fi
 if [ ! -f /var/lock/subsys/vprocunhide ]; then
-	echo "Type \"/etc/rc.d/init.d/vprocunhide start\" to set /proc visibility for vservers" 1>&2
+	echo "Type \"/sbin/service vprocunhide start\" to set /proc visibility for vservers" 1>&2
 fi
 if [ ! -f /var/lock/subsys/vservers ]; then
-	echo "Type \"/etc/rc.d/init.d/vservers start\" to start vservers" 1>&2
+	echo "Type \"/sbin/service vservers start\" to start vservers" 1>&2
 fi
 
 %preun init
 if [ "$1" = "0" ]; then
-	if [ -r /var/lock/subsys/vservers ]; then
-		/etc/rc.d/init.d/vservers stop >&2
-	fi
-	if [ -r /var/lock/subsys/vprocunhide ]; then
-		/etc/rc.d/init.d/vprocunhide stop >&2
-	fi
-	if [ -r /var/lock/subsys/vrootdevices ]; then
-		/etc/rc.d/init.d/vrootdevices stop >&2
-	fi
+	%service vservers stop
+	%service vprocunhide stop
+	%service vrootdevices stop
 	/sbin/chkconfig --del vservers
 	/sbin/chkconfig --del vprocunhide
 	/sbin/chkconfig --del vrootdevices
@@ -438,20 +433,16 @@
 /sbin/chkconfig --add rebootmgr
 /sbin/chkconfig --add vservers-legacy
 if [ ! -f /var/lock/subsys/rebootmgr ] ; then
-	echo "Type \"/etc/rc.d/init.d/rebootmgr start\" to start reboot manager for legacy vservers" 1>&2
+	echo "Type \"/sbin/service rebootmgr start\" to start reboot manager for legacy vservers" 1>&2
 fi
 if [ ! -f /var/lock/subsys/vservers-legacy ] ; then
-	echo "Type \"/etc/rc.d/init.d/vservers-legacy start\" to start legacy vservers" 1>&2
+	echo "Type \"/sbin/service vservers-legacy start\" to start legacy vservers" 1>&2
 fi
 
 %preun legacy
 if [ "$1" = "0" ]; then
-	if [ -r /var/lock/subsys/rebootmgr ] ; then
-		/etc/rc.d/init.d/rebootmgr stop >&2
-	fi
-	if [ -r /var/lock/subsys/vservers-legacy ] ; then
-		/etc/rc.d/init.d/vservers-legacy stop >&2
-	fi
+	%service rebootmgr stop
+	%service vservers-legacy stop
 	/sbin/chkconfig --del rebootmgr
 	/sbin/chkconfig --del vservers-legacy
 fi
@@ -650,6 +641,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.107  2006/03/01 21:24:33  glen
+- use %service
+
 Revision 1.106  2006/03/01 21:01:02  glen
 - drop vserver-dev package, /dev tree is under %_netsharedpath and provides are in vserver-packages, rel 5
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/util-vserver.spec?r1=1.106&r2=1.107&f=u