X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=vserver-reference.init;h=c5ac0a65cff1525c0ecfe82caf511fdb365ec39e;hb=6daac782c6b03a083d178d58af30f3bc6c49b06f;hp=4458a385554c0cd00e61de7d5a3fa0b6ed5bb1bd;hpb=a51c659a0f02e2b28cef9f8d612b164535a3c3c2;p=vserver-reference.git diff --git a/vserver-reference.init b/vserver-reference.init index 4458a38..c5ac0a6 100755 --- a/vserver-reference.init +++ b/vserver-reference.init @@ -57,17 +57,36 @@ 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 + +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 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" @@ -75,8 +94,7 @@ for systemvserver in "$__DEFAULT_VSERVERDIR/.vstub/"*/*.cloned ; do mkdir -p "$__DEFAULT_VSERVERDIR/.vref" # build the systemvserver from the one it was originally cloned from - TYPE=$(cat $systemvserver) - REF="$__DEFAULT_VSERVERDIR/.vref/$TYPE" + REF="$__DEFAULT_VSERVERDIR/.vref/$SLICEFAMILY" if [ -d "$REF" ] ; then "$_VCLONE" "$REF"/ "$TMP"/ RETVAL=$? @@ -95,7 +113,7 @@ for systemvserver in "$__DEFAULT_VSERVERDIR/.vstub/"*/*.cloned ; 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"