From 192fd70c0bd5f01ea94b0bccb47ddf47518b5b2f Mon Sep 17 00:00:00 2001 From: Enrico Scholz Date: Thu, 28 Apr 2005 18:05:37 +0000 Subject: [PATCH] added support for a rescue mode git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@2069 94cd875c-1c1d-0410-91d2-eb244daf1a30 --- util-vserver/scripts/vserver.start | 12 +++++++++++- util-vserver/scripts/vserver.suexec | 3 ++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/util-vserver/scripts/vserver.start b/util-vserver/scripts/vserver.start index 2913781..3dc6795 100644 --- a/util-vserver/scripts/vserver.start +++ b/util-vserver/scripts/vserver.start @@ -72,6 +72,15 @@ is_vshelper_init= have_interfaces= startsync_pipe= +while test "$#" -gt 0; do + case "$1" in + (--rescue) INITSTYLE=rescue;; + (--rescue-cmd) INITCMD_RESCUE=( $2 ); shift;; + (*) panic $"vserver ... start: unknown option '$1'";; + esac + shift +done + set -e trap "cleanup" EXIT @@ -106,7 +115,8 @@ if $_VSERVER_INFO - FEATURE migrate; then $_VATTRIBUTE --set "${OPTS_VATTRIBUTE[@]}" -- \ $_SAVE_CTXINFO "$VSERVER_DIR" \ $_ENV -i -- \ - $_VCONTEXT --migrate-self --endsetup --chroot $SILENT_OPT "${OPTS_VCONTEXT_MIGRATE[@]}" -- \ + $_VCONTEXT --migrate-self --endsetup --chroot $SILENT_OPT \ + "${OPTS_VCONTEXT_MIGRATE[@]}" "${OPTS_VCONTEXT_ENTER[@]}" -- \ "${INITCMD_START[@]}" else if test -n "$_IS_FAKEINIT"; then diff --git a/util-vserver/scripts/vserver.suexec b/util-vserver/scripts/vserver.suexec index 79cc584..2466c21 100644 --- a/util-vserver/scripts/vserver.suexec +++ b/util-vserver/scripts/vserver.suexec @@ -33,7 +33,8 @@ if $_VSERVER_INFO - FEATURE migrate; then exec \ $_CHBIND "${CHBIND_OPTS[@]}" \ ${USE_VNAMESPACE:+$_VNAMESPACE --enter "$S_CONTEXT" -- } \ - $_VCONTEXT $SILENT_OPT --migrate --chroot --xid "$S_CONTEXT" --uid "$user" -- \ + $_VCONTEXT $SILENT_OPT --migrate --chroot \ + --xid "$S_CONTEXT" --uid "$user" "${OPTS_VCONTEXT_ENTER[@]}" -- \ "$@" else exec \ -- 1.8.1.5