From: Daniel Hokka Zakrisson Date: Mon, 20 Nov 2006 15:10:00 +0000 (+0000) Subject: Don't set _IS_FAKEINIT on rescue, let the caller decide with --rescue-init. X-Git-Tag: release-0.30.212~34 X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7c0023fda75eb9c8ec6e50da21c51a7215886b14;p=util-vserver.git Don't set _IS_FAKEINIT on rescue, let the caller decide with --rescue-init. git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@2389 94cd875c-1c1d-0410-91d2-eb244daf1a30 --- diff --git a/scripts/vserver.functions b/scripts/vserver.functions index 1236629..592d3f1 100644 --- a/scripts/vserver.functions +++ b/scripts/vserver.functions @@ -263,8 +263,6 @@ function _generateInitOptions (xrescue) INITCMD_START=( "${INITCMD_RESCUE[@]}" ) INITCMD_STOP=( /sbin/killall5 ) - _IS_FAKEINIT= - _NEED_VSHELPER_SYNC= ;; (xsysv) diff --git a/scripts/vserver.start b/scripts/vserver.start index 3ba7fb6..5911d13 100644 --- a/scripts/vserver.start +++ b/scripts/vserver.start @@ -83,6 +83,7 @@ inclusive its arguments to the cmdline." INITCMD_RESCUE=( $2 ); have_initcmd=1 shift;; + (--rescue-init) _IS_FAKEINIT=1;; (--) shift; break;; (-*) panic $"vserver ... start: unknown option '$1'";; (*) break;