X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Fscripts%2Fstart-vservers;h=2844d47461dfe0595736e71249b992dca4eb54db;hb=95cf3519da76f335389cd7a18d0090b59f81f2e7;hp=182a8ebcd8fe7932f90e167eada854579dcbfd16;hpb=d84508566060009ee67f57730f7af9cc8a3d6240;p=util-vserver.git diff --git a/util-vserver/scripts/start-vservers b/util-vserver/scripts/start-vservers index 182a8eb..2844d47 100755 --- a/util-vserver/scripts/start-vservers +++ b/util-vserver/scripts/start-vservers @@ -19,7 +19,7 @@ : ${UTIL_VSERVER_VARS:=/usr/lib/util-vserver/util-vserver-vars} test -e "$UTIL_VSERVER_VARS" || { - echo "Can not find util-vserver installation; aborting..." >&2 + echo $"Can not find util-vserver installation (the file '$UTIL_VSERVER_VARS' would be expected); aborting..." >&2 exit 1 } . "$UTIL_VSERVER_VARS" @@ -118,10 +118,6 @@ okfile=$(mktemp /tmp/vserver-init.XXXXXX) passedfile=$(mktemp /tmp/vserver-init.XXXXXX) trap "rm -rf $makedir $resultfile $passedfile" EXIT -defaulttty="$CONFDIR/.defaults/apps/init/tty" -test -c "$defaulttty" || defaulttty=$(tty) -test -c "$defaulttty" || defaulttty=/dev/null - test_cmd=false case "$OPTION_FLAVOR" in start) test_cmd="${_VSERVER} --silent '\$*' status";; @@ -130,11 +126,10 @@ esac { cat <>$passedfile ; \ -${TAB}$_VSERVER --sync ${OPTION_DEBUG:+--debug} "\$*" ${OPTION_FLAVOR} >\$(TTY) 2>\$(TTY) <\$(TTY) ; } +${TAB}$_VSERVER --defaulttty --sync ${OPTION_DEBUG:+--debug} "\$*" ${OPTION_FLAVOR}; } ${TAB}echo -n '.' >>$okfile ${TAB}@touch "\$@" EOF @@ -153,9 +148,6 @@ for i in "${vservers[@]}"; do cat "$d"/depends done | sort -u | while read vserver; do d=$CONFDIR/$vserver/apps/init - test ! -e $d/tty || { - echo -e ".$vserver.stamp:\tTTY=$d/tty" >>$makedir/Makefile - } case "$OPTION_FLAVOR" in start)