X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=scripts%2Fvserver.stop;h=6b367dde651a1ec1b4872151776b4350919a4be9;hb=4a561cdbf4fcfe7cbc58a236a9ad7bc3c2476bef;hp=4d637ea4a94ad9c9ef5c203b5acd319f6d768f05;hpb=f15ecabbb38a6e332eaf97194534e4af07e7b646;p=util-vserver.git diff --git a/scripts/vserver.stop b/scripts/vserver.stop index 4d637ea..6b367dd 100644 --- a/scripts/vserver.stop +++ b/scripts/vserver.stop @@ -48,6 +48,14 @@ trap "cleanup" EXIT OPTION_FORCE_SYNC=1 +while test "$#" -gt 0; do + case "$1" in + (--rescue-init) _IS_FAKEINIT=1;; + (--) shift; break;; + (-*) panic $"vserver ... stop: unknown option '$1'";; + esac +done + set -e generateOptions "$VSERVER_DIR" set +e @@ -66,11 +74,14 @@ fail= initWait "$VSERVER_DIR" "$S_CONTEXT" vwait_statdir if test -n "$_IS_FAKEINIT" && \ $_VSERVER_INFO - FEATURE vkill; then - $_VKILL -s INT --xid "$S_CONTEXT" -- 1 || fail=1 - ## HACK: remove the 'initpid' stuff above when PID virtualization - ## is implemented + if ! vshelper.isStopSync; then + $_VKILL -s INT --xid "$S_CONTEXT" -- 1 || fail=1 + fi elif $_VSERVER_INFO - FEATURE migrate; then "${NICE_CMD[@]}" \ + "${CHBIND_CMD[@]}" \ + "$_VSPACE" --enter "$S_CONTEXT" "${OPTS_VSPACE[@]}" -- \ + "$_VTAG" --migrate "${OPTS_VTAG_ENTER[@]}" --silent -- \ $_VCONTEXT $SILENT_OPT --migrate --chroot --xid "$S_CONTEXT" -- \ "${INITCMD_STOP[@]}" || fail=1 else @@ -83,10 +94,10 @@ else fi # Remove persistent so those contexts can be stopped -$_VATTRIBUTE --set --xid "$S_CONTEXT" --flag ~persistent 2>/dev/null || : +$_VATTRIBUTE --set --xid "$S_CONTEXT" --flag !persistent 2>/dev/null || : if $_VSERVER_INFO -q "$S_CONTEXT" XIDTYPE static && $_VSERVER_INFO - FEATURE vnet; then - $_NATTRIBUTE --set --nid "$S_CONTEXT" --flag ~persistent 2>/dev/null || : + $_NATTRIBUTE --set --nid "$S_CONTEXT" --flag !persistent 2>/dev/null || : fi vshelper.doStopSync @@ -101,7 +112,9 @@ sendKillSequence "$S_CONTEXT" "${INITKILL_SEQ[@]}" echo $"Vserver '$VSERVER_DIR' still running unexpectedly; please investigate it manually..." >&2 execScriptlets "$VSERVER_DIR" "$VSERVER_NAME" post-stop - + +handleDeviceMap --unset "$S_CONTEXT" "$VSERVER_DIR/apps/vdevmap" + umountVserver "$VSERVER_DIR" || : disableInterfaces "$VSERVER_DIR"