Skip to content
Snippets Groups Projects
Commit 50c3bb26 authored by zuul's avatar zuul Committed by Gerrit Code Review
Browse files

Merge "contrib: Let safe_asterisk script continue without /dev/tty9."

parents 9d54dd04 56caf540
No related branches found
No related tags found
No related merge requests found
...@@ -120,13 +120,20 @@ if test -n "$TTY" && test "$TTY" != "no"; then ...@@ -120,13 +120,20 @@ if test -n "$TTY" && test "$TTY" != "no"; then
TTY=tty${TTY} TTY=tty${TTY}
elif test -c /dev/vc/${TTY}; then elif test -c /dev/vc/${TTY}; then
TTY=vc/${TTY} TTY=vc/${TTY}
elif test "$TTY" = "9"; then # ignore default if it was untouched
# If there is no /dev/tty9 and not /dev/vc/9 we don't
# necessarily want to die at this point. Pretend that
# TTY wasn't set.
TTY=
else else
message "Cannot find specified TTY (${TTY})" message "Cannot find specified TTY (${TTY})"
exit 1 exit 1
fi fi
ASTARGS="${ASTARGS} -vvvg" if test -n "$TTY"; then
if test "$CONSOLE" != "no"; then ASTARGS="${ASTARGS} -vvvg"
ASTARGS="${ASTARGS} -c" if test "$CONSOLE" != "no"; then
ASTARGS="${ASTARGS} -c"
fi
fi fi
fi fi
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment