X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Fscripts%2Fvserver.stop;h=853092734726fb625d5bd4bc86992afb16fe024d;hb=458493abf095511b4819a1afac87ddaede3b252b;hp=f86697a1fda96c60a3b893d7f35ecc471c484377;hpb=66ff8eb2e4f7e51fab7bf0eae4a756c9f54b7132;p=util-vserver.git diff --git a/util-vserver/scripts/vserver.stop b/util-vserver/scripts/vserver.stop index f86697a..8530927 100644 --- a/util-vserver/scripts/vserver.stop +++ b/util-vserver/scripts/vserver.stop @@ -15,29 +15,74 @@ # 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 - umountVserver "$VSERVER_DIR" &>/dev/null || : - disableInterfaces "$VSERVER_DIR" &>/dev/null || : - exit 1 + warning $"vserver '$VSERVER_NAME' is not running" >&2 + test -n "$OPTION_DEBUG" || exec 2>/dev/null >/dev/null + umountVserver "$VSERVER_DIR" || : + disableInterfaces "$VSERVER_DIR" || : + 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/ -"${NICE_CMD[@]}" \ + +test -z "$OPTION_DEFAULTTTY" || setDefaultTTY "$VSERVER_DIR" + +fail= +if test -n "$_IS_FAKEINIT" && \ + $_VSERVER_INFO - FEATURE vkill && \ + initpid=$($_VSERVER_INFO "$S_CONTEXT" INITPID 2>/dev/null); then + $_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[@]}" || fail=1 +else + "${NICE_CMD[@]}" \ "$_CHBIND" "${CHBIND_OPTS[@]}" \ "$_EXEC_ULIMIT" "$VSERVER_DIR/ulimits" \ - "$_CHCONTEXT" "${CHCONTEXT_OPTS[@]}" \ - "$_CAPCHROOT" "${CAPCHROOT_OPTS[@]}" . "${INITCMD_STOP[@]}" && \ - "${INITCMD_STOP_SYNC[@]}" || : + ${USE_VNAMESPACE:+$_VNAMESPACE --enter "$S_CONTEXT"} \ + $_CHCONTEXT_COMPAT "${CHCONTEXT_OPTS[@]}" \ + "$_CAPCHROOT" "${CAPCHROOT_OPTS[@]}" "." \ + "${INITCMD_STOP[@]}" || fail=1 +fi + +test -n "$fail" || waitForSync "$VSERVER_DIR" "$sync_fifo" + +vshelper.doDestroy "$VSERVER_DIR" "$S_CONTEXT" +sendKillSequence "$S_CONTEXT" "${INITKILL_SEQ[@]}" -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