X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=util-vserver.spec;h=dc6d7ba51ab209123b8d6714b0868ebe1f136397;hb=4ec24a524547a6f4cbdc9c724c7b3291b04a1e1b;hp=11ffebcd68ead4c77e7e1a0361d96f6487d58cf6;hpb=351160822bf4f9d223e63e113f253058bdc88eea;p=util-vserver.git

diff --git a/util-vserver.spec b/util-vserver.spec
index 11ffebc..dc6d7ba 100644
--- 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
 
-%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
-# vcached no longer runs as a daemon
-chkconfig vcached off
-chkconfig --del vcached
-
 chkconfig --add vservers
 chkconfig vservers on
 
@@ -115,7 +104,7 @@ fi
 %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