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

diff --git a/vserver-reference.init b/vserver-reference.init
index a9b7e4f..f1e1434 100755
--- a/vserver-reference.init
+++ b/vserver-reference.init
@@ -35,8 +35,8 @@ exec 3>&1
 exec 4>&2
 
 # Redirect stdout and stderr to a log file
+exec >>/var/log/vserver-reference.log
 exec 2>&1
-exec &>>/var/log/vserver-reference.log
 
 echo "--- STARTING $(date) ---"  >&3 2>&4
 
@@ -55,9 +55,15 @@ shopt -s nullglob
 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
-for systemvserver in "$__DEFAULT_VSERVERDIR/.vstub/"*.cloned ; do
+# 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
@@ -71,12 +77,16 @@ for systemvserver in "$__DEFAULT_VSERVERDIR/.vstub/"*.cloned ; do
 	# build the systemvserver from the one it was originally cloned from
 	TYPE=$(cat $systemvserver)
 	REF="$__DEFAULT_VSERVERDIR/.vref/$TYPE"
-	"$_VCLONE" "$REF"/ "$TMP"/
-	RETVAL=$?
+	if [ -d "$REF" ] ; then
+	    "$_VCLONE" "$REF"/ "$TMP"/
+	    RETVAL=$?
+	else
+	    RETVAL=1
+	fi
 
-	# merge the stub with the reference to get the system slice
+	# merge the stub with the reference to get the system vserver
  	if [ $RETVAL -eq 0 ] ; then
-	    rsync -a "$__DEFAULT_VSERVERDIR/.vstub/$NAME"/ "$TMP"/
+	    (cd "$DIR/$NAME"/ && find . | cpio -m -d -u -p "$TMP"/)
 	    RETVAL=$?
 	fi
 
@@ -88,6 +98,7 @@ for systemvserver in "$__DEFAULT_VSERVERDIR/.vstub/"*.cloned ; do
 	    mv "$TMP" "$__DEFAULT_VSERVERDIR/.vref/$NAME"
 	    success >&3 2>&4
 	else
+	    rm -rf "$TMP"
 	    failure >&3 2>&4
 	fi
 	echo >&3 2>&4
@@ -99,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