X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=vserver-reference.spec;h=8c53b5de1bcbf137cca2f29aea5087da2dc72d59;hb=refs%2Fheads%2Fplanetlab-3_3-branch;hp=86d4e09dc207a930fd689ffaefa94fba47276537;hpb=0c5dc3b4c2af1803b8d792514ed7391a2c3e6668;p=sliceimage.git

diff --git a/vserver-reference.spec b/vserver-reference.spec
index 86d4e09..8c53b5d 100644
--- a/vserver-reference.spec
+++ b/vserver-reference.spec
@@ -1,6 +1,6 @@
 %define name vserver-reference
 %define version 3.1
-%define release 1.planetlab%{?date:.%{date}}
+%define release 2%{?pldistro:.%{pldistro}}%{?date:.%{date}}
 
 Vendor: PlanetLab
 Packager: PlanetLab Central <support@planet-lab.org>
@@ -33,11 +33,15 @@ RPM_BUILD_DIR=$RPM_BUILD_DIR ./build.sh
 %install
 rm -rf $RPM_BUILD_ROOT
 install -D -m 755 %{name}.init $RPM_BUILD_ROOT/%{_initrddir}/%{name}
+install -D -m 644 vserver-reference.cron $RPM_BUILD_ROOT/%{_sysconfdir}/cron.d/vserver-reference
 find vservers/vserver-reference | cpio -p -d -u $RPM_BUILD_ROOT/
 
 # If run under sudo, allow user to delete the build directory
 if [ -n "$SUDO_USER" ] ; then
     chown -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 {} \;
 fi
 
 %clean
@@ -51,6 +55,7 @@ fi
 %files
 %defattr(-,root,root)
 %{_initrddir}/%{name}
+%{_sysconfdir}/cron.d/vserver-reference
 /vservers/vserver-reference
 
 %define vcached_pid /var/run/vcached.pid
@@ -60,7 +65,7 @@ fi
 if [ -r %{vcached_pid} ] ; then
     kill $(cat %{vcached_pid})
 fi
-touch %{vcached_pid}
+echo $$ > %{vcached_pid}
 
 # vcached will clean up .vtmp later
 mkdir -p /vservers/.vtmp
@@ -79,6 +84,11 @@ chkconfig --add %{name}
 chkconfig %{name} 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