support for multiple slice reference images

[sliceimage.git] / vserver-reference.init

diff --git a/vserver-reference.init b/vserver-reference.init
index 52964c9..f1e1434 100755 (executable)
--- a/vserver-reference.init
+++ b/vserver-reference.init
@@ -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,24 +49,21 @@ else
     PLC_BOOT_HOST="boot.planet-lab.org"
 fi
 
-# Save stdout and stderr
-exec 3>&1
-exec 4>&2
-
-# Redirect stdout and stderr to a log file
-exec 2>&1
-exec &>/var/log/vserver-reference.log
-
 shopt -s nullglob
 
 # Make sure the barrier bit is set
 chmod 0000 "$__DEFAULT_VSERVERDIR"
 setattr --barrier "$__DEFAULT_VSERVERDIR"
 
+# 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
+
 # Build reference images for system slices
-# XXX Use Stork?
-for lst in "$__DEFAULT_VSERVERDIR/system-packages/"*.lst ; do
-    NAME=$(basename $lst .lst)
+# 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)
 
     # Copy base reference image
     if [ ! -d "$__DEFAULT_VSERVERDIR/.vref/$NAME" ] ; then
@@ -66,15 +73,21 @@ for lst in "$__DEFAULT_VSERVERDIR/system-packages/"*.lst ; do
        mkdir -p "$__DEFAULT_VSERVERDIR/.vtmp"
        TMP=$(mktemp -d "$__DEFAULT_VSERVERDIR/.vtmp/$NAME.XXXXXX")
        mkdir -p "$__DEFAULT_VSERVERDIR/.vref"
-       "$__PKGLIBDIR/vbuild" "$__DEFAULT_VSERVERDIR/.vref/default" "$TMP"
-       RETVAL=$?
 
-       # Install/update additional packages
+       # 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
-           pushd "$__DEFAULT_VSERVERDIR/system-packages" >/dev/null
-           xargs rpm --root "$TMP" --install < "$NAME.lst"
+           (cd "$DIR/$NAME"/ && find . | cpio -m -d -u -p "$TMP"/)
            RETVAL=$?
-           popd >/dev/null
        fi
 
         # Clean RPM state
@@ -85,6 +98,7 @@ for lst in "$__DEFAULT_VSERVERDIR/system-packages/"*.lst ; do
            mv "$TMP" "$__DEFAULT_VSERVERDIR/.vref/$NAME"
            success >&3 2>&4
        else
+           rm -rf "$TMP"
            failure >&3 2>&4
        fi
        echo >&3 2>&4
@@ -96,7 +110,7 @@ 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
@@ -141,6 +155,7 @@ for cacert in $CACERT ; do
 done
 
 success >&3 2>&4
+echo "--- DONE $(date) ---"  >&3 2>&4
 echo >&3 2>&4
 
 exit 0