X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=scripts%2Fvuserdel;h=872aac9dd241e8175dd60b9cf054b5ad4ac28cf2;hb=1537cdb36ae39dfd1e89e3e7969690c732de4d85;hp=c0a4ceed2a3de8eafee392f12b8065841cbe8cdb;hpb=2f48c024c10366ed48cb6ab3bbfa35081f8d1242;p=util-vserver-pl.git diff --git a/scripts/vuserdel b/scripts/vuserdel index c0a4cee..872aac9 100755 --- a/scripts/vuserdel +++ b/scripts/vuserdel @@ -27,10 +27,13 @@ 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 +$_VKILL -c "$CTX" -s 15 -- -1 sleep 2 -$_VKILL -c "$CTX" -s 9 -1 +$_VKILL -c "$CTX" -s 9 -- -1 $_VATTRIBUTE --set --xid "$CTX" --flag ~persistent $_NATTRIBUTE --set --nid "$CTX" --flag ~persistent @@ -44,9 +47,6 @@ do umount -l "$dir" done -# delete user -[ -z "$STATIC" ] && userdel -r $NAME - # remove vserver configuration directory rm -rf /etc/vservers/$NAME