X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=vserver-reference.init;h=f1e143491df9862159b6c99f410bf1cca52d0c8a;hb=2a48e93aa6f87832e212419f1268c78f06d4fb23;hp=4ab78302cdbb196e26102ee54369a3d54525fa6e;hpb=88d62822a48f558e247ce64fe59f501448ee7c73;p=sliceimage.git

diff --git a/vserver-reference.init b/vserver-reference.init
index 4ab7830..f1e1434 100755
--- a/vserver-reference.init
+++ b/vserver-reference.init
@@ -2,7 +2,7 @@
 #
 # vserver-reference	Updates VServer reference
 #
-# Load before pl_conf, pl_nm, vcached, and vservers
+# Load before nm, vcached, and vservers
 # chkconfig: 3 60 80
 # description: Builds VServer reference image
 #
@@ -30,6 +30,16 @@ esac
 # VServer definitions
 . /usr/lib/util-vserver/util-vserver-vars
 
+# Save stdout and stderr
+exec 3>&1
+exec 4>&2
+
+# Redirect stdout and stderr to a log file
+exec >>/var/log/vserver-reference.log
+exec 2>&1
+
+echo "--- STARTING $(date) ---"  >&3 2>&4
+
 # Parse PLC configuration
 if [ -r /etc/planetlab/plc_config ] ; then
     . /etc/planetlab/plc_config
@@ -39,26 +49,68 @@ else
     PLC_BOOT_HOST="boot.planet-lab.org"
 fi
 
-# Save stdout and stderr
-exec 3>&1
-exec 4>&2
+shopt -s nullglob
 
-# Redirect stdout and stderr to a log file
-exec 2>&1
-exec &>/var/log/vserver-reference.log
+# Make sure the barrier bit is set
+chmod 0000 "$__DEFAULT_VSERVERDIR"
+setattr --barrier "$__DEFAULT_VSERVERDIR"
 
-echo -n $"Updating VServer reference: " >&3 2>&4
+# Set the attribute to unlink so vclone does the right thing wrt to 
+# conserving space by linking and not copying unified files.
+find "$__DEFAULT_VSERVERDIR/.vref/*" -type f -print0 | xargs -0 setattr --iunlink
 
-shopt -s nullglob
+# Build reference images for system slices
+# xxx if several instances of systemslices get installed, only one gets instanciated
+for systemvserver in "$__DEFAULT_VSERVERDIR/.vstub/"*/*.cloned ; do
+    NAME=$(basename $systemvserver .cloned)
+    DIR=$(dirname $systemvserver)
 
-VROOTS="$__DEFAULT_VSERVERDIR/vserver-reference $__DEFAULT_VSERVERDIR/.vcache/* $__DEFAULT_VSERVERDIR/${PLC_SLICE_PREFIX}_*"
+    # Copy base reference image
+    if [ ! -d "$__DEFAULT_VSERVERDIR/.vref/$NAME" ] ; then
+	echo -n $"Building VServer reference image for $NAME: " >&3 2>&4
 
-# Make sure the barrier bit is set
-chmod 0000 /vservers
-setattr --barrier /vservers
+	# Build in temporary directory
+	mkdir -p "$__DEFAULT_VSERVERDIR/.vtmp"
+	TMP=$(mktemp -d "$__DEFAULT_VSERVERDIR/.vtmp/$NAME.XXXXXX")
+	mkdir -p "$__DEFAULT_VSERVERDIR/.vref"
+
+	# build the systemvserver from the one it was originally cloned from
+	TYPE=$(cat $systemvserver)
+	REF="$__DEFAULT_VSERVERDIR/.vref/$TYPE"
+	if [ -d "$REF" ] ; then
+	    "$_VCLONE" "$REF"/ "$TMP"/
+	    RETVAL=$?
+	else
+	    RETVAL=1
+	fi
+
+	# merge the stub with the reference to get the system vserver
+ 	if [ $RETVAL -eq 0 ] ; then
+	    (cd "$DIR/$NAME"/ && find . | cpio -m -d -u -p "$TMP"/)
+	    RETVAL=$?
+	fi
+
+        # Clean RPM state
+	rm -f "$TMP/var/lib/rpm/__db"*
+
+	# Move it to its permanent location when complete
+ 	if [ $RETVAL -eq 0 ] ; then
+	    mv "$TMP" "$__DEFAULT_VSERVERDIR/.vref/$NAME"
+	    success >&3 2>&4
+	else
+	    rm -rf "$TMP"
+	    failure >&3 2>&4
+	fi
+	echo >&3 2>&4
+    fi
+done
+
+echo -n $"Updating VServer reference images: " >&3 2>&4
+
+VROOTS="$__DEFAULT_VSERVERDIR/.vref/* $__DEFAULT_VSERVERDIR/.vcache/* $__DEFAULT_VSERVERDIR/${PLC_SLICE_PREFIX}_*"
 
 # Copy configuration files from host to slices
-for file in /etc/hosts /etc/resolv.conf /etc/yum.conf /etc/planetlab/node_id \
+for file in /etc/hosts /etc/resolv.conf /etc/planetlab/node_id \
             /etc/planetlab/plc_config* /etc/planetlab/php/* \
             /etc/pki/rpm-gpg/* ; do
     if [ -r $file ] ; then
@@ -68,6 +120,9 @@ for file in /etc/hosts /etc/resolv.conf /etc/yum.conf /etc/planetlab/node_id \
     fi
 done
 
+# Remove stale RPM locks
+rm -f $vroot/var/lib/rpm/__db*
+
 # (Re)install GPG signing keys
 if [ -d /etc/pki/rpm-gpg ] ; then
     for vroot in $VROOTS ; do
@@ -100,5 +155,7 @@ for cacert in $CACERT ; do
 done
 
 success >&3 2>&4
+echo "--- DONE $(date) ---"  >&3 2>&4
 echo >&3 2>&4
+
 exit 0