X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=vserver-reference.init;h=410e807018a6581fb52265fd39de2d15625c97b2;hb=b047c1ff7a02bca913095ec408dce663b810d9c2;hp=56c4de5ead1aff86b156abcf7bfad555817adcd0;hpb=5a949b31060abe2a1cc2d0437dced8dbb01f1026;p=vserver-reference.git

diff --git a/vserver-reference.init b/vserver-reference.init
index 56c4de5..410e807 100755
--- a/vserver-reference.init
+++ b/vserver-reference.init
@@ -28,15 +28,19 @@ esac
 . /etc/init.d/functions
 
 # VServer definitions
-. /usr/lib/util-vserver/util-vserver-vars
+init_paths="/usr/lib64/util-vserver/util-vserver-vars /usr/lib/util-vserver/util-vserver-vars"
+for init_path in $init_paths ; do
+    [ -f $init_path ] && { source $init_path ; break; }
+done
+[ "$PACKAGE_NAME" = "util-vserver" ] || echo "WARNING: could not find util-vserver init file among $init_paths"
 
 # 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
-exec &>>/var/log/vserver-reference.log
 
 echo "--- STARTING $(date) ---"  >&3 2>&4
 
@@ -55,28 +59,57 @@ 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.
+
+if [ -f /proc/virtual/info ] ; then
+	x=$[ 16#`awk '/^VCIKernel:/ { print $2 }' /proc/virtual/info` ]; 
+	y=$[ (x >> 9) & 1]
+	if test "$y" = 1 ; then 
+		# COW support
+		find "$__DEFAULT_VSERVERDIR/.vref"/* -type f -print0 | xargs -0 setattr --iunlink
+	else 
+		# no COW; 
+		find "$__DEFAULT_VSERVERDIR/.vref"/* -type f -print0 | xargs -0 setattr --~iunlink
+	fi
+fi
+
+
 # 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
+    # e.g. NAME=planetflow
+    NAME=$(basename $systemvserver .cloned)
+    DIR=$(dirname $systemvserver)
+    # e.g. SLICEFAMILY=planetlab-f8-i386
+    SLICEFAMILY=$(cat $systemvserver)
+    # deduce the actual name used in .vref by replacing the first part of slice-family 
+    # (pldistro) with the slice name
+    # e.g. VREFNAME=planetflow-f8-i386
+    VREFNAME=$(echo $SLICEFAMILY | sed -e "s,^[^-]*-,$NAME-,")
 
     # Copy base reference image
-    if [ ! -d "$__DEFAULT_VSERVERDIR/.vref/$NAME" ] ; then
-	echo -n $"Building VServer reference image for $NAME: " >&3 2>&4
+    if [ ! -d "$__DEFAULT_VSERVERDIR/.vref/$VREFNAME" ] ; then
+	echo -n $"Building VServer reference image for $NAME in $VREFNAME: " >&3 2>&4
 
 	# Build in temporary directory
 	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
+	REF="$__DEFAULT_VSERVERDIR/.vref/$SLICEFAMILY"
+	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
@@ -84,9 +117,10 @@ for lst in "$__DEFAULT_VSERVERDIR/system-packages/"*.lst ; do
 
 	# Move it to its permanent location when complete
  	if [ $RETVAL -eq 0 ] ; then
-	    mv "$TMP" "$__DEFAULT_VSERVERDIR/.vref/$NAME"
+	    mv "$TMP" "$__DEFAULT_VSERVERDIR/.vref/$VREFNAME"
 	    success >&3 2>&4
 	else
+	    rm -rf "$TMP"
 	    failure >&3 2>&4
 	fi
 	echo >&3 2>&4
@@ -98,7 +132,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
@@ -108,8 +142,12 @@ 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*
+
+for vroot in $VROOTS ; do
+    # NOTE: without this step, the 'rpm --allmatches' step can hang on boot
+    # Remove stale RPM locks from all VROOT dirs
+    rm -f $vroot/var/lib/rpm/__db*
+done
 
 # (Re)install GPG signing keys
 if [ -d /etc/pki/rpm-gpg ] ; then