diff options
author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2016-08-03 20:14:32 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-08-03 20:14:32 -0400 |
commit | 19c8201744035d92a6480cc58944c0c18fcebdc6 (patch) | |
tree | b718ee042a6d42292255dcbefffd777a2dc9ec54 /src/core/main.c | |
parent | d26d41f36c598aeddcb25cca19ee3526f771c045 (diff) | |
parent | f7b7b3df9e24713464d9089f62958c8c5c3aac49 (diff) |
Merge pull request #3820 from poettering/nspawn-resolvconf
nspawn resolv.conf handling improvements, and inherit $TERM all the way through nspawn → console login
Diffstat (limited to 'src/core/main.c')
-rw-r--r-- | src/core/main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/main.c b/src/core/main.c index c46d886653..094bbef964 100644 --- a/src/core/main.c +++ b/src/core/main.c @@ -1318,7 +1318,7 @@ static int fixup_environment(void) { return r; if (r == 0) { - term = strdup(default_term_for_tty("/dev/console") + 5); + term = strdup(default_term_for_tty("/dev/console")); if (!term) return -ENOMEM; } |