X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=scripts%2Fvcached;h=0e09c7e76ac29844f0b92771750262e67d3134ba;hb=95e2774070e989fe9cf9f48dae5fa054e55e2a3e;hp=570a1db053b4fd1fb13235c2c61a86da24c686e6;hpb=60f04198795b93fc02ca7eed0834653a7d6b3016;p=util-vserver.git

diff --git a/scripts/vcached b/scripts/vcached
index 570a1db..0e09c7e 100755
--- a/scripts/vcached
+++ b/scripts/vcached
@@ -16,7 +16,7 @@
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (c) 2004-2005 The Trustees of Princeton University
 #
-# $Id: vcached,v 1.11 2005/08/21 21:37:10 mlhuang Exp $
+# $Id: vcached,v 1.14 2007/07/05 19:05:14 dhozac Exp $
 #
 
 PATH=/sbin:/usr/sbin:$PATH
@@ -79,7 +79,7 @@ test -e "$UTIL_VSERVER_VARS" || {
 setattr --barrier $__DEFAULT_VSERVERDIR
 
 # take out the trash
-rm -rf "$__DEFAULT_VSERVERDIR/.vtmp"
+#rm -rf "$__DEFAULT_VSERVERDIR/.vtmp"
 
 mkdir -p "$__DEFAULT_VSERVERDIR/.vcache"
 mkdir -p "$__DEFAULT_VSERVERDIR/.vtmp"
@@ -90,17 +90,10 @@ for i in $(seq 0 $(($slots - 1))) ; do
 	echo "$(date) Caching v$i"
 	# build image in .vtmp
 	TMP=$(mktemp -d "$__DEFAULT_VSERVERDIR/.vtmp/v$i.XXXXXX")
-	"$__PKGLIBDIR/vbuild" "$__DEFAULT_VSERVERDIR/vserver-reference" "$TMP"
+	"$_VCLONE" "$__DEFAULT_VSERVERDIR/.vref/default/" "$TMP"/
 	RETVAL=$?
 	# move it to .vcache when complete
 	if [ $RETVAL -eq 0 ] ; then
-	    # sanity check
-	    vnewsize=$(du -s "$TMP" | awk "{ print \$1 }")
-	    vrefsize=$(du -s "$__DEFAULT_VSERVERDIR/vserver-reference" | awk "{ print \$1 }")
-	    if [ $vnewsize -lt $vrefsize ] ; then
-		echo "WARNING: Unexpected for 'du -s $__DEFAULT_VSERVERDIR/$NAME'=$vnewsize to be less than 'du -s $__DEFAULT_VSERVERDIR/vserver-reference'=$vrefsize"
-	    fi
-
 	    mv "$TMP" "$__DEFAULT_VSERVERDIR/.vcache/v$i"
 	    echo "$(date) v$i ready"
 	else