- use new 0.30.208 util-vserver-vars variable names

- also "unlock" accounts in /etc/passwd if appropriate
- use legacy vserver script to execute commands inside vserver

diff --git a/scripts/vuseradd b/scripts/vuseradd
index 2be0ac9..5fffe4d 100755 (executable)
--- a/scripts/vuseradd
+++ b/scripts/vuseradd
@@ -4,10 +4,10 @@
 #
 # Copyright (c) 2004  The Trustees of Princeton University (Trustees).
 #
-# $Id: vuseradd,v 1.21 2005/04/26 21:23:28 mlhuang Exp $
+# $Id: vuseradd,v 1.22 2005/07/28 21:30:07 smuir Exp $
 #
 
-: ${UTIL_VSERVER_VARS:=$(dirname $0)/util-vserver-vars}
+: ${UTIL_VSERVER_VARS:=/usr/lib/util-vserver/util-vserver-vars}
 test -e "$UTIL_VSERVER_VARS" || {
     echo "Can not find util-vserver installation; aborting..."
     exit 1
@@ -31,68 +31,70 @@ groupadd slices 2>/dev/null || :
 [ -z "$STATIC" ] && useradd -g slices -s /bin/vsh $NAME
 
 # openssh-server 3.8 and above refuse login for "locked" accounts
-sed -i -e "s/$NAME:\!\!:\(.*\)/$NAME:*:\1/" /etc/shadow
+for file in /etc/passwd /etc/shadow ; do
+    [ -f $file ] && sed -i -e "s/$NAME:\!\!:\(.*\)/$NAME:*:\1/" $file
+done
 
 USERID=`id -u $NAME`
 GROUPID=`id -g $NAME`
 GROUPNAME=`id -gn $NAME`
 
 # create vserver configuration file
-if [ ! -f /etc/vservers/$NAME.conf ] ; then
+if [ ! -f $__CONFDIR/$NAME.conf ] ; then
     sed \
        -e "s/.*S_CONTEXT=.*/S_CONTEXT=$USERID/" \
        -e "s/.*ONBOOT=.*/ONBOOT=yes/" \
-       < $PKGLIBDIR/sample.conf \
-       > /etc/vservers/$NAME.conf
+       < $__PKGLIBDIR/defaults/sample.conf \
+       > $__CONFDIR/$NAME.conf
 fi
 
-if [ ! -d "$VROOTDIR/$NAME" ] ; then
+if [ ! -d "$__DEFAULT_VSERVERDIR/$NAME" ] ; then
     # check the cache
     shopt -s nullglob
-    for i in "$VROOTDIR/.vcache/"* ; do
-       [ -d "$i" ] && mv "$i" "$VROOTDIR/$NAME" && break
+    for i in "$__DEFAULT_VSERVERDIR/.vcache/"* ; do
+       [ -d "$i" ] && mv "$i" "$__DEFAULT_VSERVERDIR/$NAME" && break
     done
     # build vserver
-    if [ ! -d "$VROOTDIR/$NAME" ] ; then
+    if [ ! -d "$__DEFAULT_VSERVERDIR/$NAME" ] ; then
        # build image in .vtmp
-       TMP=$(mktemp -d "$VROOTDIR/.vtmp/$NAME.XXXXXX")
-       "$PKGLIBDIR/vbuild" "$VROOTDIR/vserver-reference" "$TMP"
+       TMP=$(mktemp -d "$__DEFAULT_VSERVERDIR/.vtmp/$NAME.XXXXXX")
+       "$__PKGLIBDIR/vbuild" "$__DEFAULT_VSERVERDIR/vserver-reference" "$TMP"
        RETVAL=$?
        # move it to .vcache when complete
        if [ $RETVAL -ne 0 ] ; then 
-           echo "Error $RETVAL building $VROOTDIR/$NAME"
-           rm -rf "$TMP" /etc/vservers/$NAME.conf /var/run/vservers/$NAME.ctx
+           echo "Error $RETVAL building $__DEFAULT_VSERVERDIR/$NAME"
+           rm -rf "$TMP" $__CONFDIR/$NAME.conf $__PKGSTATEDIR/$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 }")
+           vrefsize=$(du -s "$__DEFAULT_VSERVERDIR/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"
+               echo "WARNING: Unexpected for 'du -s $__DEFAULT_VSERVERDIR/$NAME'=$vnewsize to be less than 'du -s $__DEFAULT_VSERVERDIR/vserver-reference'=$vrefsize"
            fi
 
-           mv "$TMP" "$VROOTDIR/$NAME"
+           mv "$TMP" "$__DEFAULT_VSERVERDIR/$NAME"
        fi
     fi
 fi
 
-if [ -d "$VROOTDIR/$NAME" ] ; then
+if [ -d "$__DEFAULT_VSERVERDIR/$NAME" ] ; then
     # fix permissions
-    chmod 755 "$VROOTDIR/$NAME"
+    chmod 755 "$__DEFAULT_VSERVERDIR/$NAME"
 
     # add user in vserver
-    vserver $NAME suexec root groupadd -g $GROUPID $GROUPNAME
-    vserver $NAME suexec root useradd -u $USERID -g $GROUPID -p '' $NAME
+    $_VSERVER_LEGACY $NAME suexec root sh -c \
+       "groupadd -g $GROUPID $GROUPNAME ; 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"
+    if [ -f "$__DEFAULT_VSERVERDIR/$NAME/etc/sudoers" ] && \
+       ! grep -q "^$NAME" "$__DEFAULT_VSERVERDIR/$NAME/etc/sudoers" ; then
+       echo "$NAME     ALL=(ALL)       ALL" >> "$__DEFAULT_VSERVERDIR/$NAME/etc/sudoers"
     fi
 fi
 
 # turn resource management on for vserver $NAME
-service resman start $NAME
+chkconfig resman && service resman start $NAME
 # XXX - resman doesn't print a trailing newline
 echo