#
# Copyright (c) 2004 The Trustees of Princeton University (Trustees).
#
-# $Id: vuseradd,v 1.14 2004/10/20 21:45:15 mef Exp $
+# $Id: vuseradd,v 1.21 2005/04/26 21:23:28 mlhuang Exp $
#
: ${UTIL_VSERVER_VARS:=$(dirname $0)/util-vserver-vars}
}
[ -z "$1" ] && usage
+[ "$1" == "--static" ] && { STATIC=yes; shift; }
NAME=$1
# add slices group if not already present
groupadd slices 2>/dev/null || :
# add user
-useradd -g slices -s /bin/vsh $NAME
+[ -z "$STATIC" ] && useradd -g slices -s /bin/vsh $NAME
-USERID=$(awk -F: "\$1 == \"$NAME\" { print \$3 }" < /etc/passwd)
-GROUPID=$(awk -F: "\$1 == \"slices\" { print \$3 }" < /etc/group)
+# openssh-server 3.8 and above refuse login for "locked" accounts
+sed -i -e "s/$NAME:\!\!:\(.*\)/$NAME:*:\1/" /etc/shadow
+
+USERID=`id -u $NAME`
+GROUPID=`id -g $NAME`
+GROUPNAME=`id -gn $NAME`
# create vserver configuration file
if [ ! -f /etc/vservers/$NAME.conf ] ; then
"$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
chmod 755 "$VROOTDIR/$NAME"
# add user in vserver
- vserver $NAME suexec root groupadd -g $GROUPID slices
+ vserver $NAME suexec root groupadd -g $GROUPID $GROUPNAME
vserver $NAME suexec root useradd -u $USERID -g $GROUPID -p '' $NAME
# add an unrestricted entry to /etc/sudoers file
# turn resource management on for vserver $NAME
service resman start $NAME
+# XXX - resman doesn't print a trailing newline
+echo