merge with 0.30.213

[util-vserver.git] / scripts / vuserdel

diff --git a/scripts/vuserdel b/scripts/vuserdel
index a875dc8..778a0fa 100755 (executable)
--- a/scripts/vuserdel
+++ b/scripts/vuserdel
@@ -4,7 +4,7 @@
 #
 # Copyright (c) 2004  The Trustees of Princeton University (Trustees).
 #
-# $Id: vuserdel,v 1.8 2005/07/28 21:30:07 smuir Exp $
+# $Id: vuserdel,v 1.11 2007/06/29 14:13:01 dhozac Exp $
 #
 
 : ${UTIL_VSERVER_VARS:=/usr/lib/util-vserver/util-vserver-vars}
@@ -25,8 +25,7 @@ usage()
 NAME=$1
 
 # read config file to get context ID
-. /etc/vservers/$NAME.conf
-CTX=$S_CONTEXT
+CTX=`cat $__CONFDIR/$NAME/context`
 
 # don't bother stopping gracefully, just kill all the processes
 chcontext --silent --secure --ctx $CTX $__LEGACYDIR/vserverkillall
@@ -41,16 +40,11 @@ do
         umount -l "$dir"
 done
 
-# turn resource management off for vserver $NAME
-chkconfig resman && service resman stop $NAME
-# XXX - resman doesn't print a trailing newline
-echo
-
 # delete user
 [ -z "$STATIC" ] && userdel -r $NAME
 
-# remove vserver configuration file
-rm -f /etc/vservers/$NAME.conf
+# remove vserver configuration directory
+rm -rf /etc/vservers/$NAME
 
 # remove vserver profile
 rm -f /var/run/vservers/$NAME.ctx