X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Fscripts%2Fvserver.stop;h=8dc7512b280a8f59e7b055fc1566848fdb4eb594;hb=d771a1039b7be40d461c7f1bec36aeaf904282ed;hp=347d2d4496f2ce4e101515c4e8af2eae5308d1e6;hpb=8c431d7d1ca26658e7dca0da7e0c3757432fd8c0;p=util-vserver.git diff --git a/util-vserver/scripts/vserver.stop b/util-vserver/scripts/vserver.stop index 347d2d4..8dc7512 100644 --- a/util-vserver/scripts/vserver.stop +++ b/util-vserver/scripts/vserver.stop @@ -16,25 +16,37 @@ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. if ! isVserverRunning "$VSERVER_DIR" S_CONTEXT; then - echo $"vserver '$VSERVER_NAME' is not running; aborting..." - umountVserver "$VSERVER_DIR" &>/dev/null || : - disableInterfaces "$VSERVER_DIR" &>/dev/null || : + echo $"vserver '$VSERVER_NAME' is not running; aborting..." >&2 + test "$OPTION_DEBUG" || exec 2>/dev/null >/dev/null + umountVserver "$VSERVER_DIR" || : + disableInterfaces "$VSERVER_DIR" || : 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/ -"${NICE_CMD[@]}" \ + +if $_VSERVER_INFO - FEATURE migrate; then + ${USE_VNAMESPACE:+$_VNAMESPACE --enter "$S_CONTEXT" -- } \ + $_VCONTEXT $SILENT_OPT --migrate --chroot --xid "$S_CONTEXT" -- \ + "${INITCMD_STOP[@]}" && "${INITCMD_STOP_SYNC[@]}" || : +else + "${NICE_CMD[@]}" \ "$_CHBIND" "${CHBIND_OPTS[@]}" \ - "$_CHCONTEXT" "${CHCONTEXT_OPTS[@]}" \ - "$_CAPCHROOT" "${CAPCHROOT_OPTS[@]}" . "${INITCMD_STOP[@]}" + "$_EXEC_ULIMIT" "$VSERVER_DIR/ulimits" \ + ${USE_VNAMESPACE:+$_VNAMESPACE --enter "$S_CONTEXT"} \ + $_CHCONTEXT_COMPAT "${CHCONTEXT_OPTS[@]}" \ + "$_CAPCHROOT" "${CAPCHROOT_OPTS[@]}" "." \ + "${INITCMD_STOP[@]}" && "${INITCMD_STOP_SYNC[@]}" || : +fi -"${INITCMD_STOP_SYNC[@]}" -"$_CTX_KILL" -c "$S_CONTEXT" -- "${INITKILL_SEQ[@]}" +sendKillSequence "$S_CONTEXT" "${INITKILL_SEQ[@]}" execScriptlets "$VSERVER_DIR" "$VSERVER_NAME" post-stop