#
# Copyright (c) 2004 The Trustees of Princeton University (Trustees).
#
-# $Id: vuseradd,v 1.12 2004/10/20 02:56:23 mef Exp $
+# $Id: vuseradd,v 1.18 2004/11/17 20:34:25 mef Exp $
#
: ${UTIL_VSERVER_VARS:=$(dirname $0)/util-vserver-vars}
# add user
useradd -g slices -s /bin/vsh $NAME
-# 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)
"$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"
chattr -R -i "$TMP"
- 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
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
-# PL2580 WAR: disklimit code is malfunctioning
-#[ -x /usr/sbin/disklimit ] && /usr/sbin/disklimit on $NAME
+service resman start $NAME