From 9a08c0c31d74249eec1a5e5346e1457366200df7 Mon Sep 17 00:00:00 2001
From: =?utf8?q?S=2E=C3=87a=C4=9Flar=20Onur?= <caglar@verivue.com>
Date: Wed, 23 Mar 2011 10:41:53 -0400
Subject: [PATCH] vuserdel doesn't handle new vserver features that we are
 using like mount namespaces and/or cgroups, so it silently fails most of the
 time. Remove old code and start to use vserver provided tools

---
 scripts/vuserdel | 33 +--------------------------------
 1 file changed, 1 insertion(+), 32 deletions(-)

diff --git a/scripts/vuserdel b/scripts/vuserdel
index 872aac9..ba74273 100755
--- a/scripts/vuserdel
+++ b/scripts/vuserdel
@@ -24,38 +24,7 @@ usage()
 [ "$1" == "--static" ] && { STATIC=yes; shift; }
 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
-$_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`
-do
-        # use echo -e to turn escaped whitespace back into regular chars
-        # be careful about embedded backquotes here (i think we're safe)
-        dir=`echo -e "$d"`
-        echo "unmounting $dir"
-        umount -l "$dir"
-done
-
-# remove vserver configuration directory
-rm -rf /etc/vservers/$NAME
-
-# remove vserver profile
-rm -f /var/run/vservers/$NAME.ctx
-
-# destroy vserver
-if [ -d $__DEFAULT_VSERVERDIR/$NAME ] ; then
-    TMP=$(mktemp -d "$__DEFAULT_VSERVERDIR/.vtmp/$NAME.XXXXXX")
-    mv "$__DEFAULT_VSERVERDIR/$NAME" "$TMP"
-    rm -rf "$TMP"
-fi
+vserver --silent $NAME delete > /dev/null 2> /dev/null
-- 
2.43.0