This commit was manufactured by cvs2svn to create branch

[sliceimage.git] / vserver-reference.spec

diff --git a/vserver-reference.spec b/vserver-reference.spec
index 14eed93..8c53b5d 100644 (file)
--- a/vserver-reference.spec
+++ b/vserver-reference.spec
@@ -1,6 +1,6 @@
 %define name vserver-reference
-%define version 3.0
-%define release 5.planetlab%{?date:.%{date}}
+%define version 3.1
+%define release 2%{?pldistro:.%{pldistro}}%{?date:.%{date}}
 
 Vendor: PlanetLab
 Packager: PlanetLab Central <support@planet-lab.org>
@@ -15,9 +15,11 @@ Source0: %{name}-%{version}.tar.bz2
 License: GPL
 Group: Applications/System
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
-BuildArchitectures: noarch
 Requires: util-vserver, e2fsprogs, yum
 
+AutoReqProv: no
+%define debug_package %{nil}
+
 %description
 This package creates the virtual server (VServer) reference image used
 as the installation base for new PlanetLab slivers.
@@ -26,23 +28,71 @@ as the installation base for new PlanetLab slivers.
 %setup -q
 
 %build
+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
 rm -rf $RPM_BUILD_ROOT
 
+# If run under sudo, allow user to delete the built RPM
+if [ -n "$SUDO_USER" ] ; then
+    chown $SUDO_USER %{_rpmdir}/%{_arch}/%{name}-%{version}-%{release}.%{_arch}.rpm
+fi
+
 %files
 %defattr(-,root,root)
 %{_initrddir}/%{name}
+%{_sysconfdir}/cron.d/vserver-reference
+/vservers/vserver-reference
+
+%define vcached_pid /var/run/vcached.pid
+
+%pre
+# Stop vcached
+if [ -r %{vcached_pid} ] ; then
+    kill $(cat %{vcached_pid})
+fi
+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
+fi
+if [ -d /vservers/.vcache ] ; then
+    mv /vservers/.vcache /vservers/.vtmp/.vcache.$RANDOM
+fi
+
+# Allow vcached to run again
+rm -f %{vcached_pid}
 
 %post
 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
+
 * Tue Nov 30 2004 Mark Huang <mlhuang@cs.princeton.edu> 3.0-5.planetlab
 - PL3118 and PL3131 fix: set barrier bit on /vservers instead of old
   immulink bit. Do not reset the immutable bit on the new