From: Mark Huang <mlhuang@cs.princeton.edu>
Date: Wed, 17 Nov 2004 20:37:32 +0000 (+0000)
Subject: - clean up some more junk on failure
X-Git-Tag: after-util-vserver-0_30_208-revert~206
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=8bb07c2cfb287b57d9419e57138177f952dbc0f5;p=util-vserver.git

- clean up some more junk on failure
---

diff --git a/scripts/vuseradd b/scripts/vuseradd
index 177466a..9c9457e 100755
--- a/scripts/vuseradd
+++ b/scripts/vuseradd
@@ -4,7 +4,7 @@
 #
 # Copyright (c) 2004  The Trustees of Princeton University (Trustees).
 #
-# $Id: vuseradd,v 1.17 2004/11/17 19:35:47 mef Exp $
+# $Id: vuseradd,v 1.18 2004/11/17 20:34:25 mef Exp $
 #
 
 : ${UTIL_VSERVER_VARS:=$(dirname $0)/util-vserver-vars}
@@ -57,8 +57,8 @@ if [ ! -d "$VROOTDIR/$NAME" ] ; then
 	if [ $RETVAL -ne 0 ] ; then 
 	    echo "Error $RETVAL building $VROOTDIR/$NAME"
 	    chattr -R -i "$TMP"
-	    rm -rf "$TMP"
-	    userdel $NAME
+	    rm -rf "$TMP" /etc/vservers/$NAME.conf /var/run/vservers/$NAME.ctx
+	    userdel -r $NAME
 	    exit $RETVAL
 	else
 	    # sanity check