git://git.onelab.eu
/
util-vserver.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- no need for vcached workarounds anymore
[util-vserver.git]
/
util-vserver.spec
diff --git
a/util-vserver.spec
b/util-vserver.spec
index
ef25570
..
dc6d7ba
100644
(file)
--- a/
util-vserver.spec
+++ b/
util-vserver.spec
@@
-1,6
+1,6
@@
%define name util-vserver
%define version 0.30
%define name util-vserver
%define version 0.30
-%define release 1
2
.planetlab%{?date:.%{date}}
+%define release 1
4
.planetlab%{?date:.%{date}}
Vendor: PlanetLab
Packager: PlanetLab Central <support@planet-lab.org>
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
%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
@@
-161,7
+150,12
@@
but more readily accessible from Python code.
%files py23
%defattr(0644,root,root)
%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/util_vserver_vars.py
+/usr/lib/python2.3/site-packages/vduimpl.so
/usr/lib/python2.3/site-packages/vserver.py
/usr/lib/python2.3/site-packages/vserver.pyc
/usr/lib/python2.3/site-packages/vserverimpl.so
/usr/lib/python2.3/site-packages/vserver.py
/usr/lib/python2.3/site-packages/vserver.pyc
/usr/lib/python2.3/site-packages/vserverimpl.so
@@
-169,6
+163,12
@@
but more readily accessible from Python code.
%changelog
%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
+
* Wed Jun 15 2005 Steve Muir <smuir@cs.princeton.edu>
- 'vserver-init start' functionality subsumed by Node Manager
* Wed Jun 15 2005 Steve Muir <smuir@cs.princeton.edu>
- 'vserver-init start' functionality subsumed by Node Manager