X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Fscripts%2Fvserver.stop;h=3b4153b1b7668f35993e375e589515ffd2cd9cbd;hb=00d1011e5a6f311eca82159c2b994b0e5bd4b6d2;hp=207d7a0aa06fedcaa143b385b26fde5a4ebb9eb0;hpb=041aeae35801a5ecd1a9c0ce56e2fdcfd54aac9a;p=util-vserver.git diff --git a/util-vserver/scripts/vserver.stop b/util-vserver/scripts/vserver.stop index 207d7a0..3b4153b 100644 --- a/util-vserver/scripts/vserver.stop +++ b/util-vserver/scripts/vserver.stop @@ -15,32 +15,56 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + +lock "$LOCKDIR"/vserver."$($_VSERVER_INFO "$VSERVER_DIR" CANONIFY)".startup + if ! isVserverRunning "$VSERVER_DIR" S_CONTEXT; then - echo $"vserver '$VSERVER_NAME' is not running; aborting..." >&2 + warning $"vserver '$VSERVER_NAME' is not running" >&2 test "$OPTION_DEBUG" || exec 2>/dev/null >/dev/null umountVserver "$VSERVER_DIR" || : disableInterfaces "$VSERVER_DIR" || : - exit 1 + unlock + exit 0 fi +function cleanup +{ + set +e + unlock + + test ! -p "$sync_fifo" || { + $_RM -f "$sync_fifo" + $_RMDIR $($_DIRNAME "$sync_fifo") + } +} + +sync_fifo= +trap "cleanup" EXIT + set -e generateOptions "$VSERVER_DIR" set +e +vshelper.doDestroy "$VSERVER_DIR" "$S_CONTEXT" +initSync "$VSERVER_DIR" sync_fifo +prepareStop "$VSERVER_DIR" + cd "$VSERVER_DIR"/vdir/ execScriptlets "$VSERVER_DIR" "$VSERVER_NAME" pre-stop - cd "$VSERVER_DIR"/vdir/ +test -z "$OPTION_DEFAULTTTY" || setDefaultTTY "$VSERVER_DIR" + +fail= if test "$_IS_FAKEINIT" && \ $_VSERVER_INFO - FEATURE vkill && \ initpid=$($_VSERVER_INFO "$S_CONTEXT" INITPID 2>/dev/null); then - $_VKILL -s INT -- "$initpid" && "${INITCMD_STOP_SYNC[@]}" || : + $_VKILL -s INT -- "$initpid" || fail=1 elif $_VSERVER_INFO - FEATURE migrate; then "${NICE_CMD[@]}" \ ${USE_VNAMESPACE:+$_VNAMESPACE --enter "$S_CONTEXT" -- } \ $_VCONTEXT $SILENT_OPT --migrate --chroot --xid "$S_CONTEXT" -- \ - "${INITCMD_STOP[@]}" && "${INITCMD_STOP_SYNC[@]}" || : + "${INITCMD_STOP[@]}" || fail=1 else "${NICE_CMD[@]}" \ "$_CHBIND" "${CHBIND_OPTS[@]}" \ @@ -48,10 +72,17 @@ else ${USE_VNAMESPACE:+$_VNAMESPACE --enter "$S_CONTEXT"} \ $_CHCONTEXT_COMPAT "${CHCONTEXT_OPTS[@]}" \ "$_CAPCHROOT" "${CAPCHROOT_OPTS[@]}" "." \ - "${INITCMD_STOP[@]}" && "${INITCMD_STOP_SYNC[@]}" || : + "${INITCMD_STOP[@]}" || fail=1 fi -sendKillSequence "$S_CONTEXT" "${INITKILL_SEQ[@]}" +test "$fail" || waitForSync "$VSERVER_DIR" "$sync_fifo" + +vshelper.doDestroy "$VSERVER_DIR" "$S_CONTEXT" +sendKillSequence "$S_CONTEXT" "${INITKILL_SEQ[@]}" + +## Small hack... isVserverRunning removes stale runfiles as a sideeffect +! isVserverRunning "$VSERVER_DIR" || \ + echo $"Vserver '$VSERVER_DIR' still running unexpectedly; please investigate it manually..." >&2 execScriptlets "$VSERVER_DIR" "$VSERVER_NAME" post-stop