X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=scripts%2Fvserver.functions;h=c97c0c6734a714f1a58c0f8ef78bfdac112889ba;hb=6c03c74dde26b0a0b3a17108b083a862b16fb0de;hp=472673a49326ef3b0a646c280bc2330ad8e70c08;hpb=f32bc7966248cb1b9f3c535669db577cd022c369;p=util-vserver.git diff --git a/scripts/vserver.functions b/scripts/vserver.functions index 472673a..c97c0c6 100644 --- a/scripts/vserver.functions +++ b/scripts/vserver.functions @@ -317,7 +317,15 @@ function _generateInitOptions test -n "$RUNLEVEL_START" || RUNLEVEL_START="default" RC_PATH=/usr/sbin:/usr/bin:/sbin:/bin - INITCMD_START=( env TERM=$TERM /lib/rcscripts/sh/init-vserver.sh "$RUNLEVEL_START" ) + if test -x "$vdir/vdir/lib/rcscripts/sh/init-vserver.sh"; then + RC_WRAP=/lib/rcscripts/sh/init-vserver.sh + elif test -x "$vdir/vdir/lib/rc/sh/init-vserver.sh"; then + RC_WRAP=/lib/rc/sh/init-vserver.sh + else + panic "init-vserver.sh not found; aborting" + fi + + INITCMD_START=( env TERM=$TERM $RC_WRAP "$RUNLEVEL_START" ) INITCMD_STOP=( env -i PATH=$RC_PATH TERM=$TERM RUNLEVEL=0 /sbin/rc shutdown ) INITCMD_PREPARE=( $_FAKE_RUNLEVEL 3 /var/run/utmp ) ;;