- no need for vcached workarounds anymore

[util-vserver.git] / util-vserver.spec.in

diff --git a/util-vserver.spec.in b/util-vserver.spec.in
index fcece17..0098932 100644 (file)
--- a/util-vserver.spec.in
+++ b/util-vserver.spec.in
@@ -1,6 +1,6 @@
 %define name @PACKAGE@
 %define version @VERSION@
-%define release 6.planetlab%{?date:.%{date}}
+%define release 9.planetlab%{?date:.%{date}}
 
 Vendor: PlanetLab
 Packager: PlanetLab Central <support@planet-lab.org>
@@ -82,20 +82,14 @@ 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
+
 if [ ! -f /etc/shells ] || ! grep -q '^/bin/vsh$' /etc/shells ; then
     echo /bin/vsh >> /etc/shells
 fi
+
 # make sure barrier bit is set on /vservers to prevent chroot() escapes
 %_libdir/%name/setattr --barrier /vservers
 
@@ -108,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