Make vserver <guest> start --rescue ... work again.
authorDaniel Hokka Zakrisson <daniel@hozac.com>
Mon, 20 Nov 2006 12:46:30 +0000 (12:46 +0000)
committerDaniel Hokka Zakrisson <daniel@hozac.com>
Mon, 20 Nov 2006 12:46:30 +0000 (12:46 +0000)
git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@2386 94cd875c-1c1d-0410-91d2-eb244daf1a30

scripts/vserver.functions

index 6570993..1236629 100644 (file)
@@ -247,7 +247,8 @@ function _generateInitOptions
     CHCONTEXT_INIT_OPTS=()
 
 
-    getFileValue INITSTYLE      "$cfgdir"/style
+    test -n "$INITSTYLE" || \
+      getFileValue INITSTYLE    "$cfgdir"/style
     getFileValue RUNLEVEL_START "$cfgdir"/runlevel
     getFileValue RUNLEVEL_START "$cfgdir"/runlevel.start
     getFileValue RUNLEVEL_STOP  "$cfgdir"/runlevel.stop
@@ -262,7 +263,7 @@ function _generateInitOptions
        (xrescue)
            INITCMD_START=( "${INITCMD_RESCUE[@]}" )
            INITCMD_STOP=( /sbin/killall5 )
-           _IS_FAKEINIT=1
+           _IS_FAKEINIT=
            _NEED_VSHELPER_SYNC=
            ;;