#
# Copyright (c) 2004 The Trustees of Princeton University (Trustees).
#
-# $Id: vuseradd,v 1.2 2004/08/19 22:30:30 mlh-pl_kernel Exp $
+# $Id: vuseradd,v 1.16 2004/11/12 18:44:09 mef Exp $
#
: ${UTIL_VSERVER_VARS:=$(dirname $0)/util-vserver-vars}
[ -z "$1" ] && usage
NAME=$1
-# bail on errors
-set -e
+# add slices group if not already present
+groupadd slices 2>/dev/null || :
# add user
-useradd -s /bin/vsh $NAME
-
-# change shell (in case user already exists)
-usermod -s /bin/vsh $NAME
-
-# automount keys (eval expands ~)
-eval rm -rf ~$NAME/.ssh
-eval ln -nsf /var/pl_sshd/keys/$NAME ~$NAME/.ssh
+useradd -g slices -s /bin/vsh $NAME
USERID=$(awk -F: "\$1 == \"$NAME\" { print \$3 }" < /etc/passwd)
-GROUPID=$(awk -F: "\$1 == \"$NAME\" { print \$3 }" < /etc/passwd)
+GROUPID=$(awk -F: "\$1 == \"slices\" { print \$3 }" < /etc/group)
# create vserver configuration file
if [ ! -f /etc/vservers/$NAME.conf ] ; then
- sed -e "s/#S_CONTEXT=/S_CONTEXT=$USERID/" \
- < /etc/vservers/vserver-reference.conf \
+ sed \
+ -e "s/.*S_CONTEXT=.*/S_CONTEXT=$USERID/" \
+ -e "s/.*ONBOOT=.*/ONBOOT=yes/" \
+ < $PKGLIBDIR/sample.conf \
> /etc/vservers/$NAME.conf
fi
# build image in .vtmp
TMP=$(mktemp -d "$VROOTDIR/.vtmp/$NAME.XXXXXX")
"$PKGLIBDIR/vbuild" "$VROOTDIR/vserver-reference" "$TMP"
+ RETVAL=$?
# move it to .vcache when complete
- mv "$TMP" "$VROOTDIR/$NAME"
+ if [ $RETVAL -ne 0 ] ; then
+ echo "Error $RETVAL building $VROOTDIR/$NAME"
+ chattr -R -i "$TMP"
+ rm -rf "$TMP"
+ userdel $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 "Error 'du -s $VROOTDIR/$NAME'=$vnewsize < 'du -s $VROOTDIR/vserver-reference'=$vrefsize"
+ chattr -R -i "$TMP"
+ rm -rf "$TMP"
+ userdel $NAME
+ exit 256
+ fi
+
+ mv "$TMP" "$VROOTDIR/$NAME"
+ fi
fi
+fi
+
+if [ -d "$VROOTDIR/$NAME" ] ; then
# fix permissions
chmod 755 "$VROOTDIR/$NAME"
+
+ # add user in vserver
+ vserver $NAME suexec root groupadd -g $GROUPID slices
+ vserver $NAME suexec root useradd -u $USERID -g $GROUPID -p '' $NAME
+
+ # add an unrestricted entry to /etc/sudoers file
+ if [ -f "$VROOTDIR/$NAME/etc/sudoers" ] && \
+ ! grep -q "^$NAME" "$VROOTDIR/$NAME/etc/sudoers" ; then
+ echo "$NAME ALL=(ALL) ALL" >> "$VROOTDIR/$NAME/etc/sudoers"
+ fi
fi
-# add user in vserver
-vserver $NAME suexec root groupadd -g $GROUPID $NAME
-vserver $NAME suexec root useradd -u $USERID -g $GROUPID -p '' $NAME
+# turn resource management on for vserver $NAME
+service resman start $NAME