X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=util-vserver.spec.in;h=0098932af7c0d7c04188c955a9acd1d22fcbbaca;hb=4ec24a524547a6f4cbdc9c724c7b3291b04a1e1b;hp=c8f9ded447279f5751244e60df577ab05e0dda66;hpb=c037de9ebd6aec2a459ebdd0114609fc4bdd1470;p=util-vserver.git diff --git a/util-vserver.spec.in b/util-vserver.spec.in index c8f9ded..0098932 100644 --- a/util-vserver.spec.in +++ b/util-vserver.spec.in @@ -1,13 +1,11 @@ %define name @PACKAGE@ %define version @VERSION@ -%define release 1.planetlab%{?date:.%{date}} +%define release 9.planetlab%{?date:.%{date}} Vendor: PlanetLab Packager: PlanetLab Central Distribution: PlanetLab 3.0 -URL: http://www.planet-lab.org - -%define __chattr /usr/bin/chattr +URL: http://cvs.planet-lab.org/cvs/util-vserver Summary: Linux virtual server utilities Name: %{name} @@ -23,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 @@ -51,16 +48,18 @@ linuxconf. %prep %setup -q - - -%build +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 -%__make %{?_smp_mflags} +%build +make + %install rm -rf $RPM_BUILD_ROOT %__make DESTDIR=$RPM_BUILD_ROOT install @@ -71,48 +70,43 @@ 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 + +install -D -m 644 sysv/vcached.logrotate ${RPM_BUILD_ROOT}/etc/logrotate.d/vcached + +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 %clean rm -rf $RPM_BUILD_ROOT +%post +chkconfig --add vservers +chkconfig vservers on -%define services vcached - -%pre -# 1 = install, 2 = upgrade/reinstall -if [ $1 -eq 2 ] ; then - for i in %v_services ; do - service $i stop - done +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 -%post -# 1 = install, 2 = upgrade/reinstall -if [ $1 -eq 1 ] ; then - for i in %services ; do - chkconfig --add $i - chkconfig $i on - done +%postun +# 0 = erase, 1 = upgrade +if [ "$1" = 0 ] ; then + perl -i -n -e 'next if /^\/bin\/vsh$/; print' /etc/shells fi -for i in %services ; do - service $i start -done - -%__chattr +t /vservers || : - %preun # 0 = erase, 1 = upgrade if [ $1 -eq 0 ] ; then - for i in %services ; do - service $i stop - chkconfig $i off - chkconfig --del $i - done + [ "$PL_BOOTCD" = "1" ] || service vservers stop + chkconfig vservers off + chkconfig --del vservers fi - %files %defattr(-,root,root) %doc AUTHORS COPYING ChangeLog NEWS README THANKS @@ -123,20 +117,54 @@ fi %_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 %_sbindir/newvserver %_mandir/man8/newvserver* - %changelog +* 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. @@ -145,3 +173,4 @@ fi * Fri Sep 26 2003 Enrico Scholz - 0:0.23.4-1 - initial build. +