X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=util-vserver.spec;h=2e337a3ad60a3b45b1044e95a46e748ada3df816;hb=49f2c3e784129bd7055258e42d66377083161e18;hp=84771a0ab14579e7729ba05bd98cfcd8d663c5c9;hpb=06e1018272502e1d15d6d8f32b80fa96420785b8;p=util-vserver.git diff --git a/util-vserver.spec b/util-vserver.spec index 84771a0..2e337a3 100644 --- a/util-vserver.spec +++ b/util-vserver.spec @@ -1,13 +1,19 @@ -%define __chattr /usr/bin/chattr +%define name util-vserver +%define version 0.30 +%define release 15.planetlab%{?date:.%{date}} + +Vendor: PlanetLab +Packager: PlanetLab Central +Distribution: PlanetLab 3.0 +URL: http://cvs.planet-lab.org/cvs/util-vserver Summary: Linux virtual server utilities -Name: util-vserver -Version: 0.29 -Release: 0 +Name: %{name} +Version: %{version} +Release: %{release} Epoch: 0 Copyright: GPL Group: System Environment/Base -URL: http://savannah.nongnu.org/projects/util-vserver/ Source0: http://savannah.nongnu.org/download/util-vserver/stable.pkg/%version/%name-%version.tar.bz2 Provides: %name-devel = %epoch:%version-%release BuildRoot: %_tmppath/%name-%version-%release-root @@ -15,7 +21,6 @@ Provides: vserver = %epoch:%version-%release Conflicts: vserver < %epoch:%version-%release Conflicts: vserver > %epoch:%version-%release BuildRequires: e2fsprogs-devel -Requires(post): %__chattr %package linuxconf Summary: Linuxconf administration modules for vservers @@ -43,12 +48,17 @@ linuxconf. %prep %setup -q +aclocal -I m4 +autoconf +automake --add-missing +# bootstrap to avoid BuildRequires of kernel-source +for linux in $RPM_BUILD_DIR/linux-* /lib/modules/`uname -r`/build ; do + [[ -d $linux/include ]] && %configure --with-kerneldir=$linux --enable-linuxconf && break +done %build -%configure --enable-linuxconf -%__make %{?_smp_mflags} - +make %install rm -rf $RPM_BUILD_ROOT @@ -60,41 +70,48 @@ test "%_initrddir" = %_sysconfdir/init.d || { mv ${RPM_BUILD_ROOT}%_sysconfdir/init.d/* ${RPM_BUILD_ROOT}%_initrddir/ } +mkdir -p ${RPM_BUILD_ROOT}/bin +ln -f ${RPM_BUILD_ROOT}%_sbindir/vsh ${RPM_BUILD_ROOT}/bin/vsh -%clean -rm -rf $RPM_BUILD_ROOT - - -%define v_services httpd named portmap sendmail smb sshd xinetd -%post -/sbin/chkconfig --add vservers -/sbin/chkconfig --add rebootmgr +install -D -m 644 sysv/vcached.logrotate ${RPM_BUILD_ROOT}/etc/logrotate.d/vcached -for i in %v_services; do - /sbin/chkconfig --add v_$i -done +mkdir -p $RPM_BUILD_ROOT/etc/cron.d +. sysv/vcached.conf +echo "*/$(($period / 60)) * * * * root %_sbindir/vcached -s -f -l $logfile" > $RPM_BUILD_ROOT/etc/cron.d/vcached -%__chattr +t /vservers || : +%__make -C python INSTALL_ROOT=$RPM_BUILD_ROOT install +%clean +rm -rf $RPM_BUILD_ROOT -%preun -test "$1" != 0 || for i in %v_services; do - /sbin/chkconfig --del v_$i -done +%post +chkconfig --add vservers +chkconfig vservers on -test "$1" != 0 || %{_initrddir}/rebootmgr stop &>/dev/null || : -test "$1" != 0 || /sbin/chkconfig --del rebootmgr -test "$1" != 0 || /sbin/chkconfig --del vservers +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 %postun -test "$1" = 0 || %{_initrddir}/rebootmgr condrestart >/dev/null || : +# 0 = erase, 1 = upgrade +if [ "$1" = 0 ] ; then + perl -i -n -e 'next if /^\/bin\/vsh$/; print' /etc/shells +fi +%preun +# 0 = erase, 1 = upgrade +if [ $1 -eq 0 ] ; then + [ "$PL_BOOTCD" = "1" ] || service vservers stop + chkconfig vservers off + chkconfig --del vservers +fi %files %defattr(-,root,root) %doc AUTHORS COPYING ChangeLog NEWS README THANKS -%doc doc/FAQ.txt %_sbindir/* %_libdir/%name %_includedir/vserver.h @@ -102,12 +119,17 @@ test "$1" = 0 || %{_initrddir}/rebootmgr condrestart >/dev/null || : %_mandir/man8/* %config %_initrddir/* %config(noreplace) /etc/vservers.conf +%config(noreplace) /etc/vcached.conf +/etc/logrotate.d/vcached +/etc/cron.d/vcached +%dir /etc/vservers %attr(0,root,root) %dir /vservers +%attr(4755,root,root) /usr/sbin/vsh +%attr(4755,root,root) /bin/vsh %exclude %_sbindir/newvserver %exclude %_mandir/man8/newvserver* - %files linuxconf %defattr(-,root,root) %config(noreplace) /etc/vservers/newvserver.defaults @@ -115,7 +137,90 @@ test "$1" = 0 || %{_initrddir}/rebootmgr condrestart >/dev/null || : %_mandir/man8/newvserver* + +%package py23 +Summary: Python modules for manipulating vservers +Group: Applications/System +Requires: python /usr/lib/util-vserver/util-vserver-vars util-python + +%description py23 +Python modules for manipulating vservers. Provides a superset of the +functionality of the vserver script (at least will do in the future), +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 +/usr/lib/python2.3/site-packages/vserver.pyc +/usr/lib/python2.3/site-packages/vserverimpl.so + + + %changelog +* Thu Jul 28 2005 Steve Muir +- add support for static vserver IDs to vuseradd and vuserdel + +* Thu Jul 21 2005 Steve Muir +- add bwlimit and cpulimit modules + +* Mon Jun 20 2005 Steve Muir +- import Marc's vdu implementation + +* Wed Jun 15 2005 Steve Muir +- 'vserver-init start' functionality subsumed by Node Manager + +* Thu Jun 02 2005 Marc E. Fiuczynski +- Fixed vlimit command + +* Wed May 25 2005 Steve Muir +- add Python modules for manipulating vservers + +* Thu Apr 7 2005 Steve Muir +- vuserdel changes: don't shutdown vserver, just kill all processes; + unmount all mountpoints in vserver before deleting + +* Fri Nov 19 2004 Mark Huang +- vcached no longer runs as a daemon +- do not restart vservers when package is upgraded + +* Wed Nov 17 2004 Mark Huang 0.30-6.planetlab ++ planetlab-3_0-rc4 +- PL2445 +- Both vcached and vuseradd now print a warning message when vbuild + succeeds but the resulting new vserver image is smaller in size than + the vserver-reference image. +- vuseradd: clean up some more junk on failure + +* Tue Nov 16 2004 Mark Huang 0.30-5.planetlab ++ planetlab-3_0-rc3 +- PL3026: This is the upgraded version of vdu that maintains an + internal hash table of files with a nlink count > 1. Only if vdu + sees all hard links to a particular inode does it add its size and + block count to the total. + +* Fri Nov 12 2004 Mark Huang 0.30-4.planetlab +- PL2445 Use -b option to du to avoid rounding errors. + +* Sat Nov 6 2004 Mark Huang 0.30-3.planetlab ++ planetlab-3_0-rc2 +- don't create the symbolic link /home/slice/.ssh, this is not how + pl_sshd works + +* Mon Oct 11 2004 Marc E. Fiuczynski +- added vsh + +* Wed Aug 11 2004 Mark Huang 0.29-1.planetlab +- initial PlanetLab 3.0 build. + +* Thu Mar 18 2004 Enrico Scholz - 0:0.29.3-0 +- removed '%%doc doc/FAQ.txt' since file does not exist anymore * Fri Sep 26 2003 Enrico Scholz - 0:0.23.4-1 - initial build. +