PL2445 Use -b option to du to avoid rounding errors.

[util-vserver.git] / scripts / vuseradd

diff --git a/scripts/vuseradd b/scripts/vuseradd
index 6449cb6..36a0f95 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.9 2004/10/11 19:03:52 mef Exp $
+# $Id: vuseradd,v 1.15 2004/11/06 16:10:42 mlhuang Exp $
 #
 
 : ${UTIL_VSERVER_VARS:=$(dirname $0)/util-vserver-vars}
@@ -29,10 +29,6 @@ groupadd slices 2>/dev/null || :
 # add user
 useradd -g slices -s /bin/vsh $NAME
 
-# automount keys (eval expands ~)
-eval rm -rf ~$NAME/.ssh
-eval ln -nsf /var/pl_sshd/keys/$NAME ~$NAME/.ssh
-
 USERID=$(awk -F: "\$1 == \"$NAME\" { print \$3 }" < /etc/passwd)
 GROUPID=$(awk -F: "\$1 == \"slices\" { print \$3 }" < /etc/group)
 
@@ -59,9 +55,10 @@ if [ ! -d "$VROOTDIR/$NAME" ] ; then
        RETVAL=$?
        # move it to .vcache when complete
        if [ $RETVAL -ne 0 ] || \
-          [ $(du -s "$TMP" | awk "{ print \$1 }") -lt \
-             $(du -s "$VROOTDIR/vserver-reference" | awk "{ print \$1 }") ] ; then
+          [ $(du -b -s "$TMP" | awk "{ print \$1 }") -lt \
+             $(du -b -s "$VROOTDIR/vserver-reference" | awk "{ print \$1 }") ] ; then
            echo "Error $RETVAL building $VROOTDIR/$NAME"
+           chattr -R -i "$TMP"
            rm -rf "$TMP"
            exit $RETVAL
        else
@@ -84,3 +81,6 @@ if [ -d "$VROOTDIR/$NAME" ] ; then
        echo "$NAME     ALL=(ALL)       ALL" >> "$VROOTDIR/$NAME/etc/sudoers"
     fi
 fi
+
+# turn resource management on for vserver $NAME
+service resman start $NAME