X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=util-vserver.spec.in;h=0098932af7c0d7c04188c955a9acd1d22fcbbaca;hb=4ec24a524547a6f4cbdc9c724c7b3291b04a1e1b;hp=87cb8ef2239d4b0b13085082b48df1cdcb1a25f9;hpb=1a43dac876c8482c784db5c0ff61e096e00cd120;p=util-vserver.git

diff --git a/util-vserver.spec.in b/util-vserver.spec.in
index 87cb8ef..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 <support@planet-lab.org>
 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
@@ -76,36 +73,25 @@ test "%_initrddir" = %_sysconfdir/init.d || {
 mkdir -p ${RPM_BUILD_ROOT}/bin
 ln -f ${RPM_BUILD_ROOT}%_sbindir/vsh ${RPM_BUILD_ROOT}/bin/vsh
 
-%clean
-rm -rf $RPM_BUILD_ROOT
+install -D -m 644 sysv/vcached.logrotate ${RPM_BUILD_ROOT}/etc/logrotate.d/vcached
 
-%define services vcached vservers
+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
 
-%pre
-# 1 = install, 2 = upgrade/reinstall
-if [ $1 -eq 2 ] ; then
-    for i in %{services} ; do
-	[ "`/sbin/runlevel`" = "unknown" ] || service $i stop || :
-    done
-fi
+%clean
+rm -rf $RPM_BUILD_ROOT
 
 %post
-# 1 = install, 2 = upgrade/reinstall
-if [ $1 -eq 1 ] ; then
-    for i in %{services} ; do
-	chkconfig --add $i
-	chkconfig $i on
-    done
-fi
-for i in %{services} ; do
-    [ "`/sbin/runlevel`" = "unknown" ] || service $i start
-done
+chkconfig --add vservers
+chkconfig vservers on
+
 if [ ! -f /etc/shells ] || ! grep -q '^/bin/vsh$' /etc/shells ; then
     echo /bin/vsh >> /etc/shells
 fi
 
-%__chattr +t /vservers || :
-
+# make sure barrier bit is set on /vservers to prevent chroot() escapes
+%_libdir/%name/setattr --barrier /vservers
 
 %postun
 # 0 = erase, 1 = upgrade
@@ -116,11 +102,9 @@ fi
 %preun
 # 0 = erase, 1 = upgrade
 if [ $1 -eq 0 ] ; then
-    for i in %{services} ; do
-	[ "`/sbin/runlevel`" = "unknown" ] || service $i stop || :
-	chkconfig $i off
-	chkconfig --del $i
-    done
+    [ "$PL_BOOTCD" = "1" ] || service vservers stop
+    chkconfig vservers off
+    chkconfig --del vservers
 fi
 
 %files
@@ -134,6 +118,8 @@ fi
 %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
@@ -149,7 +135,34 @@ fi
 %_mandir/man8/newvserver*
 
 %changelog
-* Mon Oct 11 2004 Marc E. Fiuczynski <mef@cs.princeton.edu> 0.1-1.planetlab
+* Fri Nov 19 2004 Mark Huang <mlhuang@cs.princeton.edu>
+- vcached no longer runs as a daemon
+- do not restart vservers when package is upgraded
+
+* Wed Nov 17 2004 Mark Huang <mlhuang@cs.princeton.edu> 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 <mlhuang@cs.princeton.edu> 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 <mlhuang@cs.princeton.edu> 0.30-4.planetlab
+- PL2445 Use -b option to du to avoid rounding errors.
+
+* Sat Nov  6 2004 Mark Huang <mlhuang@cs.princeton.edu> 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 <mef@cs.princeton.edu>
 - added vsh
 
 * Wed Aug 11 2004 Mark Huang <mlhuang@cs.princeton.edu> 0.29-1.planetlab