PL2445

[util-vserver.git] / scripts / vuseradd

diff --git a/scripts/vuseradd b/scripts/vuseradd
index 36a0f95..177466a 100755 (executable)
--- a/scripts/vuseradd
+++ b/scripts/vuseradd
@@ -4,7 +4,7 @@
 #
 # Copyright (c) 2004  The Trustees of Princeton University (Trustees).
 #
-# $Id: vuseradd,v 1.15 2004/11/06 16:10:42 mlhuang Exp $
+# $Id: vuseradd,v 1.17 2004/11/17 19:35:47 mef Exp $
 #
 
 : ${UTIL_VSERVER_VARS:=$(dirname $0)/util-vserver-vars}
@@ -54,14 +54,20 @@ if [ ! -d "$VROOTDIR/$NAME" ] ; then
        "$PKGLIBDIR/vbuild" "$VROOTDIR/vserver-reference" "$TMP"
        RETVAL=$?
        # move it to .vcache when complete
-       if [ $RETVAL -ne 0 ] || \
-          [ $(du -b -s "$TMP" | awk "{ print \$1 }") -lt \
-             $(du -b -s "$VROOTDIR/vserver-reference" | awk "{ print \$1 }") ] ; then
+       if [ $RETVAL -ne 0 ] ; then 
            echo "Error $RETVAL building $VROOTDIR/$NAME"
            chattr -R -i "$TMP"
            rm -rf "$TMP"
+           userdel $NAME
            exit $RETVAL
        else
+           # sanity check
+           vnewsize=$(du -s "$TMP" | awk "{ print \$1 }")
+           vrefsize=$(du -s "$VROOTDIR/vserver-reference" | awk "{ print \$1 }")
+           if [ $vnewsize -lt $vrefsize ] ; then
+               echo "WARNING: Unexpected for 'du -s $VROOTDIR/$NAME'=$vnewsize to be less than 'du -s $VROOTDIR/vserver-reference'=$vrefsize"
+           fi
+
            mv "$TMP" "$VROOTDIR/$NAME"
        fi
     fi