From: Enrico Scholz Date: Tue, 20 Apr 2004 18:00:58 +0000 (+0000) Subject: use --defaulttty options instead of setting tty manually X-Git-Tag: VERSION_0_10~104 X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7fdb31f6a9475c02a5e56e3a83c22f37ede24792;p=util-vserver.git use --defaulttty options instead of setting tty manually git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@1477 94cd875c-1c1d-0410-91d2-eb244daf1a30 --- diff --git a/util-vserver/scripts/start-vservers b/util-vserver/scripts/start-vservers index 89c23a2..2844d47 100755 --- a/util-vserver/scripts/start-vservers +++ b/util-vserver/scripts/start-vservers @@ -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)