From 1e22b5cda04b6d5e0dd83ab8e6ecb452cf34851f Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 28 Jan 2016 16:25:39 +0100
Subject: 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
---
 src/basic/terminal-util.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'src/basic/terminal-util.c')

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) {
-- 
cgit v1.2.3-54-g00ecf