X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=scripts%2Fvuseradd;h=f779ffc1d81ed76c09c913bc75012a95d753a87c;hb=5dd1ea431149f8ef74242b68a22f940fea05c0e4;hp=2052c533a1132a637974e694b1c1680d7ccb8176;hpb=bcc732602797b48f0d138a9f6af24af10b0319f9;p=util-vserver.git

diff --git a/scripts/vuseradd b/scripts/vuseradd
index 2052c53..f779ffc 100755
--- 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:52:28 mlh-pl_kernel Exp $
+# $Id: vuseradd,v 1.11 2004/10/12 21:27:05 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
@@ -84,3 +88,12 @@ if [ -d "$VROOTDIR/$NAME" ] ; then
 	echo "$NAME	ALL=(ALL)	ALL" >> "$VROOTDIR/$NAME/etc/sudoers"
     fi
 fi
+
+# turn resource management on for vserver $NAME
+[ -x /usr/sbin/vs2ckrm ]  && /usr/sbin/vs2ckrm on $NAME
+[ -x /usr/sbin/cpulimit ]  && /usr/sbin/cpulimit on $NAME
+[ -x /usr/sbin/tasklimit ]  && /usr/sbin/tasklimit on $NAME
+[ -x /usr/sbin/iolimit ]  && /usr/sbin/iolimit on $NAME
+[ -x /usr/sbin/memlimit ]  && /usr/sbin/memlimit on $NAME
+[ -x /usr/sbin/bwlimit ]  && /usr/sbin/bwlimit on $NAME
+[ -x /usr/sbin/disklimit ]  && /usr/sbin/disklimit on $NAME