diff options
| author | Daniel Mack <github@zonque.org> | 2016-01-28 17:37:06 +0100 |
|---|---|---|
| committer | Daniel Mack <github@zonque.org> | 2016-01-28 17:37:06 +0100 |
| commit | 9e83569d8ff219730912ecac441843b9531b079c (patch) | |
| tree | 12dbaa356557f24bbe08458e8391610a52932dc1 /src/basic/terminal-util.c | |
| parent | cd72d2044ad28b475bf84a38ba6db45292467dd8 (diff) | |
| parent | ad6b1fa287c1d007fd85aa3e85b7e4a6bc7f515f (diff) | |
Merge pull request #2463 from poettering/machined-tty-fix
Fixes for the service TTY reset logic and other stuff
Diffstat (limited to 'src/basic/terminal-util.c')
| -rw-r--r-- | src/basic/terminal-util.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/basic/terminal-util.c b/src/basic/terminal-util.c index fedfc8a5df..0a9d2bbdef 100644 --- a/src/basic/terminal-util.c +++ b/src/basic/terminal-util.c @@ -726,9 +726,7 @@ bool tty_is_vc_resolve(const char *tty) { } const char *default_term_for_tty(const char *tty) { - assert(tty); - - return tty_is_vc_resolve(tty) ? "TERM=linux" : "TERM=vt220"; + return tty && tty_is_vc_resolve(tty) ? "TERM=linux" : "TERM=vt220"; } int fd_columns(int fd) { |