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

diff --git a/util-vserver.spec b/util-vserver.spec
index 4350d8c..dc6d7ba 100644
--- a/util-vserver.spec
+++ b/util-vserver.spec
@@ -1,6 +1,6 @@
 %define name util-vserver
 %define version 0.30
-%define release 13.planetlab%{?date:.%{date}}
+%define release 14.planetlab%{?date:.%{date}}
 
 Vendor: PlanetLab
 Packager: PlanetLab Central <support@planet-lab.org>
@@ -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
@@ -161,6 +150,10 @@ but more readily accessible from Python code.
 
 %files py23
 %defattr(0644,root,root)
+/usr/lib/python2.3/site-packages/bwlimit.py
+/usr/lib/python2.3/site-packages/bwlimit.pyc
+/usr/lib/python2.3/site-packages/cpulimit.py
+/usr/lib/python2.3/site-packages/cpulimit.pyc
 /usr/lib/python2.3/site-packages/util_vserver_vars.py
 /usr/lib/python2.3/site-packages/vduimpl.so
 /usr/lib/python2.3/site-packages/vserver.py
@@ -170,6 +163,9 @@ but more readily accessible from Python code.
 
 
 %changelog
+* Thu Jul 21 2005 Steve Muir <smuir@cs.princeton.edu>
+- add bwlimit and cpulimit modules
+
 * Mon Jun 20 2005 Steve Muir <smuir@cs.princeton.edu>
 - import Marc's vdu implementation