- bump release number for vserver.py bugfix

[util-vserver.git] / scripts / vuseradd

diff --git a/scripts/vuseradd b/scripts/vuseradd
index 5fffe4d..3a531f3 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.22 2005/07/28 21:30:07 smuir Exp $
+# $Id: vuseradd,v 1.24 2005/09/02 20:00:39 mlhuang Exp $
 #
 
 : ${UTIL_VSERVER_VARS:=/usr/lib/util-vserver/util-vserver-vars}
@@ -56,11 +56,11 @@ if [ ! -d "$__DEFAULT_VSERVERDIR/$NAME" ] ; then
     done
     # build vserver
     if [ ! -d "$__DEFAULT_VSERVERDIR/$NAME" ] ; then
-       # build image in .vtmp
-       TMP=$(mktemp -d "$__DEFAULT_VSERVERDIR/.vtmp/$NAME.XXXXXX")
+       # build in temporary directory
+       TMP=$(mktemp -d "$__DEFAULT_VSERVERDIR/.$NAME.XXXXXX")
        "$__PKGLIBDIR/vbuild" "$__DEFAULT_VSERVERDIR/vserver-reference" "$TMP"
        RETVAL=$?
-       # move it to .vcache when complete
+       # move it to its permanent location when complete
        if [ $RETVAL -ne 0 ] ; then 
            echo "Error $RETVAL building $__DEFAULT_VSERVERDIR/$NAME"
            rm -rf "$TMP" $__CONFDIR/$NAME.conf $__PKGSTATEDIR/$NAME.ctx
@@ -93,8 +93,3 @@ if [ -d "$__DEFAULT_VSERVERDIR/$NAME" ] ; then
        echo "$NAME     ALL=(ALL)       ALL" >> "$__DEFAULT_VSERVERDIR/$NAME/etc/sudoers"
     fi
 fi
-
-# turn resource management on for vserver $NAME
-chkconfig resman && service resman start $NAME
-# XXX - resman doesn't print a trailing newline
-echo