X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Fscripts%2Fvserver.stop;h=8a5c5a2b276bee2b97024ff821b4eb1579ace174;hb=4fc0d7c31dd9fb6bae2e77ba37d8a08ab26dd65c;hp=3e1ca8ca19cd14c250782ed9c38f4327ae02570d;hpb=221c549c20a359fa3dc39614357137e174968d03;p=util-vserver.git diff --git a/util-vserver/scripts/vserver.stop b/util-vserver/scripts/vserver.stop index 3e1ca8c..8a5c5a2 100644 --- a/util-vserver/scripts/vserver.stop +++ b/util-vserver/scripts/vserver.stop @@ -17,14 +17,16 @@ if ! isVserverRunning "$VSERVER_DIR" S_CONTEXT; then echo $"vserver '$VSERVER_NAME' is not running; aborting..." - umountVserver "$VSERVER_DIR" &>/dev/null || : + umountVserver "$VSERVER_DIR" &>/dev/null || : disableInterfaces "$VSERVER_DIR" &>/dev/null || : exit 1 fi +set -e generateOptions "$VSERVER_DIR" - set +e + +cd "$VSERVER_DIR"/vdir/ execScriptlets "$VSERVER_DIR" "$VSERVER_NAME" pre-stop cd "$VSERVER_DIR"/vdir/ @@ -32,10 +34,10 @@ cd "$VSERVER_DIR"/vdir/ "$_CHBIND" "${CHBIND_OPTS[@]}" \ "$_EXEC_ULIMIT" "$VSERVER_DIR/ulimits" \ "$_CHCONTEXT" "${CHCONTEXT_OPTS[@]}" \ - "$_CAPCHROOT" "${CAPCHROOT_OPTS[@]}" . "${INITCMD_STOP[@]}" + "$_CAPCHROOT" "${CAPCHROOT_OPTS[@]}" . "${INITCMD_STOP[@]}" && \ + "${INITCMD_STOP_SYNC[@]}" || : -"${INITCMD_STOP_SYNC[@]}" -"$_CTX_KILL" -c "$S_CONTEXT" -- "${INITKILL_SEQ[@]}" +sendKillSequence "$S_CONTEXT" "${INITKILL_SEQ[@]}" execScriptlets "$VSERVER_DIR" "$VSERVER_NAME" post-stop