- no need for vcached workarounds anymore

- check $PL_BOOTCD instead of runlevel

diff --git a/util-vserver.spec b/util-vserver.spec
index 11ffebc..dc6d7ba 100644 (file)
--- a/util-vserver.spec
+++ b/util-vserver.spec
@@ -84,18 +84,7 @@ echo "*/$(($period / 60)) * * * * root %_sbindir/vcached -s -f -l $logfile" > $R
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 

-%pre
-# 1 = install, 2 = upgrade/reinstall
-if [ $1 -eq 2 ] ; then
-    # vcached no longer runs as a daemon
-    [ "`/sbin/runlevel`" = "unknown" ] || service vcached stop || :
-fi
-

 %post
 %post

-# vcached no longer runs as a daemon
-chkconfig vcached off
-chkconfig --del vcached
-

 chkconfig --add vservers
 chkconfig vservers on
 
 chkconfig --add vservers
 chkconfig vservers on
 


@@ -115,7 +104,7 @@ fi
 %preun
 # 0 = erase, 1 = upgrade
 if [ $1 -eq 0 ] ; then
 %preun
 # 0 = erase, 1 = upgrade
 if [ $1 -eq 0 ] ; then

-    [ "`/sbin/runlevel`" = "unknown" ] || service vservers stop
+    [ "$PL_BOOTCD" = "1" ] || service vservers stop

     chkconfig vservers off
     chkconfig --del vservers
 fi
     chkconfig vservers off
     chkconfig --del vservers
 fi

diff --git a/util-vserver.spec.in b/util-vserver.spec.in
index dc01744..0098932 100644 (file)
--- a/util-vserver.spec.in
+++ b/util-vserver.spec.in
@@ -82,18 +82,7 @@ echo "*/$(($period / 60)) * * * * root %_sbindir/vcached -s -f -l $logfile" > $R
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 

-%pre
-# 1 = install, 2 = upgrade/reinstall
-if [ $1 -eq 2 ] ; then
-    # vcached no longer runs as a daemon
-    [ "`/sbin/runlevel`" = "unknown" ] || service vcached stop || :
-fi
-

 %post
 %post

-# vcached no longer runs as a daemon
-chkconfig vcached off
-chkconfig --del vcached
-

 chkconfig --add vservers
 chkconfig vservers on
 
 chkconfig --add vservers
 chkconfig vservers on
 


@@ -113,7 +102,7 @@ fi
 %preun
 # 0 = erase, 1 = upgrade
 if [ $1 -eq 0 ] ; then
 %preun
 # 0 = erase, 1 = upgrade
 if [ $1 -eq 0 ] ; then

-    [ "`/sbin/runlevel`" = "unknown" ] || service vservers stop
+    [ "$PL_BOOTCD" = "1" ] || service vservers stop

     chkconfig vservers off
     chkconfig --del vservers
 fi
     chkconfig vservers off
     chkconfig --del vservers
 fi