calls 'service resman start ' rather than the *limit scripts directly

[util-vserver.git] / scripts / vuseradd

diff --git a/scripts/vuseradd b/scripts/vuseradd
index ef264a6..e27e638 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.6 2004/08/26 22:28:49 mlh-pl_kernel Exp $
+# $Id: vuseradd,v 1.13 2004/10/20 19:01:52 mlhuang Exp $
 #
 
 : ${UTIL_VSERVER_VARS:=$(dirname $0)/util-vserver-vars}
@@ -29,9 +29,12 @@ 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
+# automount keys
+if [ -d "/var/pl_sshd/keys/$NAME" ]; then
+    # (eval expands ~)
+    eval rm -rf ~$NAME/.ssh
+    eval ln -nsf /var/pl_sshd/keys/$NAME ~$NAME/.ssh
+fi
 
 USERID=$(awk -F: "\$1 == \"$NAME\" { print \$3 }" < /etc/passwd)
 GROUPID=$(awk -F: "\$1 == \"slices\" { print \$3 }" < /etc/group)
@@ -62,6 +65,7 @@ if [ ! -d "$VROOTDIR/$NAME" ] ; then
           [ $(du -s "$TMP" | awk "{ print \$1 }") -lt \
              $(du -s "$VROOTDIR/vserver-reference" | awk "{ print \$1 }") ] ; then
            echo "Error $RETVAL building $VROOTDIR/$NAME"
+           chattr -R -i "$TMP"
            rm -rf "$TMP"
            exit $RETVAL
        else
@@ -77,4 +81,13 @@ if [ -d "$VROOTDIR/$NAME" ] ; then
     # add user in vserver
     vserver $NAME suexec root groupadd -g $GROUPID slices
     vserver $NAME suexec root useradd -u $USERID -g $GROUPID -p '' $NAME
+
+    # add an unrestricted entry to /etc/sudoers file
+    if [ -f "$VROOTDIR/$NAME/etc/sudoers" ] && \
+       ! grep -q "^$NAME" "$VROOTDIR/$NAME/etc/sudoers" ; then
+       echo "$NAME     ALL=(ALL)       ALL" >> "$VROOTDIR/$NAME/etc/sudoers"
+    fi
 fi
+
+# turn resource management on for vserver $NAME
+service resman start $NAME