X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=scripts%2Fvserver.functions;h=592d3f1448e2b2ed56a8fd23d4132de0864b3806;hb=7c0023fda75eb9c8ec6e50da21c51a7215886b14;hp=6570993263575bc8c388c755e06fe561ef94778b;hpb=93c4a7d40d5bedb16f2cdc9f8fb7629418275a9f;p=util-vserver.git diff --git a/scripts/vserver.functions b/scripts/vserver.functions index 6570993..592d3f1 100644 --- a/scripts/vserver.functions +++ b/scripts/vserver.functions @@ -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,8 +263,6 @@ function _generateInitOptions (xrescue) INITCMD_START=( "${INITCMD_RESCUE[@]}" ) INITCMD_STOP=( /sbin/killall5 ) - _IS_FAKEINIT=1 - _NEED_VSHELPER_SYNC= ;; (xsysv)