X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=scripts%2Fvserver.stop;h=6c877a415334574898e6a160cc7619457d608410;hb=004894c3589aba3533f4c53b1650d9cc2c19ac69;hp=cdbb1390e6d2f32394b20ff98f9c10882d7a1a53;hpb=27aaa2cafdb4efb11fc3c4e03c25c671e6621b1a;p=util-vserver.git diff --git a/scripts/vserver.stop b/scripts/vserver.stop index cdbb139..6c877a4 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 @@ -71,8 +79,8 @@ if test -n "$_IS_FAKEINIT" && \ fi elif $_VSERVER_INFO - FEATURE migrate; then "${NICE_CMD[@]}" \ - "$_CHBIND" "${CHBIND_OPTS[@]}" \ - "$_VTAG" --migrate "${OPTS_VTAG_MIGRATE[@]}" -- \ + "${CHBIND_CMD[@]}" \ + "$_VTAG" --migrate "${OPTS_VTAG_ENTER[@]}" --silent -- \ $_VCONTEXT $SILENT_OPT --migrate --chroot --xid "$S_CONTEXT" -- \ "${INITCMD_STOP[@]}" || fail=1 else @@ -103,7 +111,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"