From: Mark Huang <mlhuang@cs.princeton.edu>
Date: Tue, 26 Jul 2005 19:02:33 +0000 (+0000)
Subject: - no need for vcached workarounds anymore
X-Git-Tag: after-util-vserver-0_30_208-revert~154
X-Git-Url: http://git.onelab.eu/?p=util-vserver.git;a=commitdiff_plain;h=4ec24a524547a6f4cbdc9c724c7b3291b04a1e1b

- 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
--- 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
diff --git a/util-vserver.spec.in b/util-vserver.spec.in
index dc01744..0098932 100644
--- 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
 
-%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
 
@@ -113,7 +102,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