X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=vserver-reference.spec;h=1616904e16da6df694d0d4931de297b10b6c302b;hb=e01407b25d5e55e4ff342bcd95998fc5f1263e62;hp=77743846b3b2b24ac1e13377de91a1dba31f8fd8;hpb=3847b719dd4f7cd08676e1eadadc7c66d342077a;p=sliceimage.git

diff --git a/vserver-reference.spec b/vserver-reference.spec
index 7774384..1616904 100644
--- a/vserver-reference.spec
+++ b/vserver-reference.spec
@@ -1,6 +1,6 @@
 %define name vserver
-%define version 3.1
-%define release 3%{?pldistro:.%{pldistro}}%{?date:.%{date}}
+%define version 4.0
+%define release 2%{?pldistro:.%{pldistro}}%{?date:.%{date}}
 
 Vendor: PlanetLab
 Packager: PlanetLab Central <support@planet-lab.org>
@@ -16,6 +16,7 @@ License: GPL
 Group: Applications/System
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 Requires: util-vserver, e2fsprogs, yum
+Requires(pre): coreutils
 
 %define debug_package %{nil}
 
@@ -46,10 +47,7 @@ This package installs the RPMS necessary to create system ("root
 
 %build
 pushd vserver-reference
-./build.sh -r 2
-# Not until we can get the build server to run Fedora Core 4 or an
-# updated version of yum.
-#./build.sh -r 4
+./build.sh
 ./system-packages.sh
 popd
 
@@ -58,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
 
@@ -78,6 +77,7 @@ fi
 %files reference
 %defattr(-,root,root)
 %{_initrddir}/vserver-reference
+%{_sysconfdir}/cron.d/vserver-reference
 /vservers/vserver-reference
 
 %files system-packages
@@ -110,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