DHOZAC suggestion to remove race between vuseradd and vcached. The only time there...

[util-vserver.git] / scripts / vcached

diff --git a/scripts/vcached b/scripts/vcached
index c587bc1..0e09c7e 100755 (executable)
--- 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.12 2005/09/03 21:47:11 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,7 +90,7 @@ 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/.vref/default" "$TMP"
+       "$_VCLONE" "$__DEFAULT_VSERVERDIR/.vref/default/" "$TMP"/
        RETVAL=$?
        # move it to .vcache when complete
        if [ $RETVAL -eq 0 ] ; then