diff options
| author | Lennart Poettering <lennart@poettering.net> | 2016-01-28 16:25:39 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2016-01-28 16:25:39 +0100 |
| commit | 1e22b5cda04b6d5e0dd83ab8e6ecb452cf34851f (patch) | |
| tree | 58d2d9b1596fa7b70259bc93e47c125903a403c1 /src/basic | |
| parent | cd72d2044ad28b475bf84a38ba6db45292467dd8 (diff) | |
core: don't reset /dev/console if stdin/stdout/stderr as passed as fd in a transient service
Otherwise we might end resetting /dev/console all the time when a transient service starts or stops.
Fixes #2377
Fixes #2198
Fixes #2061
Diffstat (limited to 'src/basic')
| -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) { |