X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=vserver-reference.spec;h=2a173796b5014aff2f447c082cee82578b680800;hb=91029451fc61906dcc37343fcfbdcded25da3435;hp=be42d5ce06b9fc42866e259da9264001d00a4084;hpb=49434eacaddec5d2899af73d795459e610e2bdbf;p=vserver-reference.git

diff --git a/vserver-reference.spec b/vserver-reference.spec
index be42d5c..2a17379 100644
--- a/vserver-reference.spec
+++ b/vserver-reference.spec
@@ -1,10 +1,10 @@
 %define name vserver
-%define version 4.0
-%define release 1%{?pldistro:.%{pldistro}}%{?date:.%{date}}
+%define version 4.1
+%define release 2%{?pldistro:.%{pldistro}}%{?date:.%{date}}
 
 Vendor: PlanetLab
 Packager: PlanetLab Central <support@planet-lab.org>
-Distribution: PlanetLab 3.0
+Distribution: PlanetLab 4.0
 URL: http://cvs.planet-lab.org/cvs/vserver-reference
 
 Summary: VServer reference image
@@ -15,7 +15,8 @@ Source0: %{name}-%{version}.tar.bz2
 License: GPL
 Group: Applications/System
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
-Requires: util-vserver, e2fsprogs, yum, coreutils
+Requires: util-vserver, e2fsprogs, yum
+Requires(pre): coreutils
 
 %define debug_package %{nil}
 
@@ -46,7 +47,7 @@ This package installs the RPMS necessary to create system ("root
 
 %build
 pushd vserver-reference
-./build.sh -r 4
+./build.sh -r $([ -f "/etc/fedora-release" ] && awk ' { if ($3=="Core") print $4; else print $3 } ' /etc/fedora-release || echo 4)
 ./system-packages.sh
 popd
 
@@ -55,6 +56,7 @@ rm -rf $RPM_BUILD_ROOT
 
 pushd vserver-reference
 install -D -m 755 vserver-reference.init $RPM_BUILD_ROOT/%{_initrddir}/vserver-reference
+install -D -m 644 vserver-reference.cron $RPM_BUILD_ROOT/%{_sysconfdir}/cron.d/vserver-reference
 find vservers | cpio -p -d -u $RPM_BUILD_ROOT/
 popd
 
@@ -64,18 +66,19 @@ rm -rf $RPM_BUILD_ROOT
 # If run under sudo
 if [ -n "$SUDO_USER" ] ; then
     # Allow user to delete the build directory
-    chown -R $SUDO_USER .
+    chown -h -R $SUDO_USER .
     # Some temporary cdroot files like /var/empty/sshd and
     # /usr/bin/sudo get created with non-readable permissions.
     find . -not -perm +0600 -exec chmod u+rw {} \;
     # Allow user to delete the built RPM(s)
-    chown -R $SUDO_USER %{_rpmdir}/%{_arch}
+    chown -h -R $SUDO_USER %{_rpmdir}/%{_arch}
 fi
 
 %files reference
 %defattr(-,root,root)
 %{_initrddir}/vserver-reference
-/vservers/vserver-reference
+%{_sysconfdir}/cron.d/vserver-reference
+/vservers/.vref/default
 
 %files system-packages
 %defattr(-,root,root)
@@ -92,8 +95,8 @@ echo $$ > %{vcached_pid}
 
 # vcached will clean up .vtmp later
 mkdir -p /vservers/.vtmp
-if [ -d /vservers/vserver-reference ] ; then
-    mv /vservers/vserver-reference /vservers/.vtmp/vserver-reference.$RANDOM
+if [ -d /vservers/.vref ] ; then
+    mv /vservers/.vref /vservers/.vtmp/.vref.$RANDOM
 fi
 if [ -d /vservers/.vcache ] ; then
     mv /vservers/.vcache /vservers/.vtmp/.vcache.$RANDOM
@@ -107,6 +110,11 @@ chkconfig --add vserver-reference
 chkconfig vserver-reference on
 [ "$PL_BOOTCD" = "1" ] || service vserver-reference start
 
+# Randomize daily run time
+M=$((60 * $RANDOM / 32768))
+H=$((24 * $RANDOM / 32768))
+sed -i -e "s/@M@/$M/" -e "s/@H@/$H/" %{_sysconfdir}/cron.d/vserver-reference
+
 %changelog
 * Tue Sep  1 2005 Mark Huang <mlhuang@cs.princeton.edu> 3.1-1.planetlab
 - Pre-package vserver-reference instead of building it on nodes