X-Git-Url: http://git.onelab.eu/?p=sliceimage.git;a=blobdiff_plain;f=initscripts%2Fvserver-sliceimage;h=ac52dd7d9234640204f11578e862a10fc3089cb4;hp=09ac2c73ecce619c344ea3a31e5e566d87ec6676;hb=HEAD;hpb=65ac7d012228ac677913d1bed4c07f28ef57cb57

diff --git a/initscripts/vserver-sliceimage b/initscripts/vserver-sliceimage
index 09ac2c7..ac52dd7 100755
--- a/initscripts/vserver-sliceimage
+++ b/initscripts/vserver-sliceimage
@@ -40,7 +40,7 @@ exec 4>&2
 exec >>/var/log/vserver-sliceimage
 exec 2>&1
 
-echo "--- STARTING $(date) ---"  >&3 2>&4
+echo "vserver-sliceimage: --- STARTING $(date) ---"
 
 # Parse PLC configuration
 if [ -r /etc/planetlab/plc_config ] ; then
@@ -75,12 +75,12 @@ fi
 
 # Build reference images for system slices
 # xxx if several instances of systemslices get installed, only one gets instanciated
-for systemslice in "$__DEFAULT_VSERVERDIR/.vstub/"*/*.cloned ; do
+for clonedstamp in "$__DEFAULT_VSERVERDIR/.vstub/"*/*.cloned ; do
     # e.g. NAME=planetflow
-    NAME=$(basename $systemslice .cloned)
-    DIR=$(dirname $systemslice)
+    NAME=$(basename $clonedstamp .cloned)
+    DIR=$(dirname $clonedstamp)
     # e.g. SLICEFAMILY=planetlab-f8-i386
-    SLICEFAMILY=$(cat $systemslice)
+    SLICEFAMILY=$(cat $clonedstamp)
     # 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
@@ -94,7 +94,7 @@ for systemslice in "$__DEFAULT_VSERVERDIR/.vstub/"*/*.cloned ; do
     [ -n "$FORCE" ] && message=Force-building
     
     # Copy base reference image
-    echo -n $"$message slice image for $NAME in $VREFNAME: " >&3 2>&4
+    echo -n $"$message slice image for $NAME in $VREFNAME: "
 
     # Build in temporary directory
     mkdir -p "$__DEFAULT_VSERVERDIR/.vtmp"
@@ -190,7 +190,7 @@ for cacert in $CACERT ; do
 done
 
 success >&3 2>&4
-echo "--- DONE $(date) ---"  >&3 2>&4
+echo "vserver-sliceimage: --- DONE $(date) ---"
 echo >&3 2>&4
 
 exit 0