#
# 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}
# 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`
umount -l "$dir"
done
-# delete user
-[ -z "$STATIC" ] && userdel -r $NAME
-
# remove vserver configuration directory
rm -rf /etc/vservers/$NAME