git://git.onelab.eu
/
util-vserver-pl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Stop the guest after creating the user/group in it.
[util-vserver-pl.git]
/
scripts
/
vuserdel
diff --git
a/scripts/vuserdel
b/scripts/vuserdel
index
c0a4cee
..
872aac9
100755
(executable)
--- a/
scripts/vuserdel
+++ b/
scripts/vuserdel
@@
-27,10
+27,13
@@
NAME=$1
# read config file to get context ID
CTX=`cat $__CONFDIR/$NAME/context`
# 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
# don't bother stopping gracefully, just kill all the processes
-$_VKILL -c "$CTX" -s 15 -1
+$_VKILL -c "$CTX" -s 15 -
- -
1
sleep 2
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
$_VATTRIBUTE --set --xid "$CTX" --flag ~persistent
$_NATTRIBUTE --set --nid "$CTX" --flag ~persistent
@@
-44,9
+47,6
@@
do
umount -l "$dir"
done
umount -l "$dir"
done
-# delete user
-[ -z "$STATIC" ] && userdel -r $NAME
-
# remove vserver configuration directory
rm -rf /etc/vservers/$NAME
# remove vserver configuration directory
rm -rf /etc/vservers/$NAME