Integrated with resman operations to enable/disable resource management

on vservers that are added/deleted, respectively.

diff --git a/scripts/vuseradd b/scripts/vuseradd
index 21e5e50..f779ffc 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.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}
@@ -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)
@@ -85,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

diff --git a/scripts/vuserdel b/scripts/vuserdel
index e021c15..57f62cf 100755 (executable)
--- a/scripts/vuserdel
+++ b/scripts/vuserdel
@@ -4,7 +4,7 @@
 #
 # Copyright (c) 2004  The Trustees of Princeton University (Trustees).
 #
-# $Id$
+# $Id: vuserdel,v 1.1 2004/07/30 16:46:41 mlh-pl_kernel Exp $
 #
 
 : ${UTIL_VSERVER_VARS:=$(dirname $0)/util-vserver-vars}
@@ -39,3 +39,6 @@ if [ -d $VROOTDIR/$NAME ] ; then
     chattr -R -i "$TMP"
     rm -rf "$TMP"
 fi
+
+# turn resource management off for vserver $NAME
+[ -x /usr/sbin/vs2ckrm ]  && /usr/sbin/vs2ckrm off $NAME