X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=scripts%2Fvuserdel;h=778a0faa876401cf1a962e00d48c04d77054e070;hb=95e2774070e989fe9cf9f48dae5fa054e55e2a3e;hp=24d4bd6cb18b1832acfd904e16dfe2df2bf377ee;hpb=49f2c3e784129bd7055258e42d66377083161e18;p=util-vserver.git

diff --git a/scripts/vuserdel b/scripts/vuserdel
index 24d4bd6..778a0fa 100755
--- a/scripts/vuserdel
+++ b/scripts/vuserdel
@@ -4,10 +4,10 @@
 #
 # Copyright (c) 2004  The Trustees of Princeton University (Trustees).
 #
-# $Id: vuserdel,v 1.7 2005/04/07 19:37:25 smuir Exp $
+# $Id: vuserdel,v 1.11 2007/06/29 14:13:01 dhozac 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
@@ -25,14 +25,13 @@ 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
-$SBINDIR/chcontext --silent --secure --ctx $CTX $PKGLIBDIR/vserverkillall
+chcontext --silent --secure --ctx $CTX $__LEGACYDIR/vserverkillall
 
 # unmount any directories in vserver that are mount points
-for d in `sed -ne "s%^[^ ]* \($VROOTDIR/$NAME/[^ ]*\) .*%\1%p" /proc/mounts`
+for d in `sed -ne "s%^[^ ]* \($__DEFAULT_VSERVERDIR/$NAME/[^ ]*\) .*%\1%p" /proc/mounts`
 do
         # use echo -e to turn escaped whitespace back into regular chars
         # be careful about embedded backquotes here (i think we're safe)
@@ -41,23 +40,18 @@ do
         umount -l "$dir"
 done
 
-# turn resource management off for vserver $NAME
-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
 
 # destroy vserver
-if [ -d $VROOTDIR/$NAME ] ; then
-    TMP=$(mktemp -d "$VROOTDIR/.vtmp/$NAME.XXXXXX")
-    mv "$VROOTDIR/$NAME" "$TMP"
+if [ -d $__DEFAULT_VSERVERDIR/$NAME ] ; then
+    TMP=$(mktemp -d "$__DEFAULT_VSERVERDIR/.vtmp/$NAME.XXXXXX")
+    mv "$__DEFAULT_VSERVERDIR/$NAME" "$TMP"
     rm -rf "$TMP"
 fi