X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=scripts%2Fvserver.stop;h=07e189fd8047962bbb1f1cf1042b0e4c13429d84;hb=38db7c63850871d51a423c53d4ceb3a2f6ef0819;hp=51b917837cb8a45dac85e1f53c03fbcbff524ac3;hpb=f48776091c9b8d3c0a203f4525ffdbfc7850e1ca;p=util-vserver.git diff --git a/scripts/vserver.stop b/scripts/vserver.stop index 51b9178..07e189f 100644 --- a/scripts/vserver.stop +++ b/scripts/vserver.stop @@ -50,7 +50,7 @@ OPTION_FORCE_SYNC=1 while test "$#" -gt 0; do case "$1" in - (--rescue-init) _IS_FAKEINIT=1;; + (--rescue-init) shift; _IS_FAKEINIT=1;; (--) shift; break;; (-*) panic $"vserver ... stop: unknown option '$1'";; esac @@ -70,6 +70,8 @@ cd "$VSERVER_DIR"/vdir/ test -z "$OPTION_DEFAULTTTY" || setDefaultTTY "$VSERVER_DIR" +$_VATTRIBUTE --set --xid "$S_CONTEXT" --flag !SC_HELPER + fail= initWait "$VSERVER_DIR" "$S_CONTEXT" vwait_statdir if test -n "$_IS_FAKEINIT" && \ @@ -94,10 +96,10 @@ else fi # Remove persistent so those contexts can be stopped -$_VATTRIBUTE --set --xid "$S_CONTEXT" --flag ~persistent 2>/dev/null || : -if $_VSERVER_INFO -q "$S_CONTEXT" XIDTYPE static && +$_VATTRIBUTE --set --xid "$S_CONTEXT" --flag !persistent 2>/dev/null || : +if $_VSERVER_INFO -q "$N_CONTEXT" XIDTYPE static && $_VSERVER_INFO - FEATURE vnet; then - $_NATTRIBUTE --set --nid "$S_CONTEXT" --flag ~persistent 2>/dev/null || : + $_NATTRIBUTE --set --nid "$N_CONTEXT" --flag !persistent 2>/dev/null || : fi vshelper.doStopSync