now returns 1k block count rather than 512byte block count

[util-vserver.git] / scripts / vuseradd

diff --git a/scripts/vuseradd b/scripts/vuseradd
index 3633535..429a959 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.8 2004/09/22 17:55:12 mlhuang Exp $
+# $Id: vuseradd,v 1.20 2004/11/23 14:47:35 mlhuang Exp $
 #
 
 : ${UTIL_VSERVER_VARS:=$(dirname $0)/util-vserver-vars}
@@ -27,11 +27,10 @@ NAME=$1
 groupadd slices 2>/dev/null || :
 
 # add user
-useradd -g slices -s /usr/sbin/vsh $NAME
+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
+# openssh-server 3.8 and above refuse login for "locked" accounts
+sed -i -e "s/$NAME:\!\!:\(.*\)/$NAME:*:\1/" /etc/shadow
 
 USERID=$(awk -F: "\$1 == \"$NAME\" { print \$3 }" < /etc/passwd)
 GROUPID=$(awk -F: "\$1 == \"slices\" { print \$3 }" < /etc/group)
@@ -58,13 +57,19 @@ if [ ! -d "$VROOTDIR/$NAME" ] ; then
        "$PKGLIBDIR/vbuild" "$VROOTDIR/vserver-reference" "$TMP"
        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
+       if [ $RETVAL -ne 0 ] ; then 
            echo "Error $RETVAL building $VROOTDIR/$NAME"
-           rm -rf "$TMP"
+           rm -rf "$TMP" /etc/vservers/$NAME.conf /var/run/vservers/$NAME.ctx
+           userdel -r $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
@@ -84,3 +89,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