X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=scripts%2Fvuserdel;h=ba742736ecc84eccfc34d50bf78170bec6c0361f;hb=9a08c0c31d74249eec1a5e5346e1457366200df7;hp=c0a4ceed2a3de8eafee392f12b8065841cbe8cdb;hpb=2f48c024c10366ed48cb6ab3bbfa35081f8d1242;p=util-vserver-pl.git

diff --git a/scripts/vuserdel b/scripts/vuserdel
index c0a4cee..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`
-
-# 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
-
 # delete user
 [ -z "$STATIC" ] && userdel -r $NAME
 
-# 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