X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=scripts%2Fvuserdel;h=872aac9dd241e8175dd60b9cf054b5ad4ac28cf2;hb=289a5b5d7a75dcef7f4cc6ef1ee258e3938311ea;hp=778a0faa876401cf1a962e00d48c04d77054e070;hpb=73929cd988b29cc673ff12945fc921957bd3ce78;p=util-vserver-pl.git

diff --git a/scripts/vuserdel b/scripts/vuserdel
index 778a0fa..872aac9 100755
--- a/scripts/vuserdel
+++ b/scripts/vuserdel
@@ -4,7 +4,7 @@
 #
 # Copyright (c) 2004  The Trustees of Princeton University (Trustees).
 #
-# $Id: vuserdel,v 1.11 2007/06/29 14:13:01 dhozac Exp $
+# $Id$
 #
 
 : ${UTIL_VSERVER_VARS:=/usr/lib/util-vserver/util-vserver-vars}
@@ -27,8 +27,15 @@ NAME=$1
 # read config file to get context ID
 CTX=`cat $__CONFDIR/$NAME/context`
 
+# delete user
+[ -z "$STATIC" ] && userdel -r $NAME
+
 # don't bother stopping gracefully, just kill all the processes
-chcontext --silent --secure --ctx $CTX $__LEGACYDIR/vserverkillall
+$_VKILL -c "$CTX" -s 15 -- -1
+sleep 2
+$_VKILL -c "$CTX" -s 9 -- -1
+$_VATTRIBUTE --set --xid "$CTX" --flag ~persistent
+$_NATTRIBUTE --set --nid "$CTX" --flag ~persistent
 
 # unmount any directories in vserver that are mount points
 for d in `sed -ne "s%^[^ ]* \($__DEFAULT_VSERVERDIR/$NAME/[^ ]*\) .*%\1%p" /proc/mounts`
@@ -40,9 +47,6 @@ do
         umount -l "$dir"
 done
 
-# delete user
-[ -z "$STATIC" ] && userdel -r $NAME
-
 # remove vserver configuration directory
 rm -rf /etc/vservers/$NAME