#
# Copyright (c) 2004 The Trustees of Princeton University (Trustees).
#
-# $Id: vuseradd,v 1.10 2004/10/11 19:38:48 mef Exp $
+# $Id: vuseradd,v 1.11 2004/10/12 21:27:05 mlhuang Exp $
#
: ${UTIL_VSERVER_VARS:=$(dirname $0)/util-vserver-vars}
# 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)
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