X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=vserver-reference.spec;h=0fdb21a6f1aab46329ca29d26c676ec0b81aacc2;hb=bbc1a08ac1cef26a946e3af552a2ac83499ffd88;hp=9a4298cfa2ce51d33608641ca9fd7cf47a9c7c31;hpb=208e5be30349820ab251c3e9ba0d806f63543c83;p=sliceimage.git

diff --git a/vserver-reference.spec b/vserver-reference.spec
index 9a4298c..0fdb21a 100644
--- a/vserver-reference.spec
+++ b/vserver-reference.spec
@@ -1,3 +1,4 @@
+
 %define name vserver-reference
 %define version 3.1
 %define release 1.planetlab%{?date:.%{date}}
@@ -42,14 +43,38 @@ 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)
 /vservers/vserver-reference
 
+%define vcached_pid /var/run/vcached.pid
+
+%pre
+# Stop vcached
+if [ -r %{vcached_pid} ] ; then
+    kill $(cat %{vcached_pid})
+fi
+touch %{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
+
 %post
 VROOT=/vservers/vserver-reference
 
 # Make sure the barrier bit is set
+chmod 0000 /vservers
 setattr --barrier /vservers
 
 # Copy configuration files from host to reference image
@@ -67,6 +92,7 @@ elif [ -d /mnt/cdrom/bootme/cacert ] ; then
     MA_NAME="PlanetLab Central"
     MA_BOOT_SERVER=$(head -1 /mnt/cdrom/bootme/BOOTSERVER)
     MA_BOOT_SERVER_CACERT=/mnt/cdrom/bootme/cacert/$MA_BOOT_SERVER/cacert.pem
+    mkdir -p $VROOT/etc/planetlab
     cat > $VROOT/etc/planetlab/primary_ma <<EOF
 MA_NAME="$MA_NAME"
 MA_BOOT_SERVER="$MA_BOOT_SERVER"
@@ -81,6 +107,12 @@ install -D -m 644 $MA_BOOT_SERVER_CACERT $VROOT/$MA_BOOT_SERVER_CACERT
 install -D -m 644 $MA_BOOT_SERVER_CACERT $VROOT/mnt/cdrom/bootme/cacert/$MA_BOOT_SERVER/cacert.pem
 echo $MA_BOOT_SERVER > $VROOT/mnt/cdrom/bootme/BOOTSERVER
 
+# Update packages and populate header cache
+chroot $VROOT yum --sslcertdir /mnt/cdrom/bootme/cacert -y update
+
+# Allow vcached to run again
+rm -f %{vcached_pid}
+
 %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