Merge pull request #3820 from poettering/nspawn-resolvconf

nspawn resolv.conf handling improvements, and inherit $TERM all the way through nspawn → console login
2016-08-03 20:14:32 -04:00
parent d26d41f36c f7b7b3df9e
commit 19c8201744
6 changed files with 90 additions and 56 deletions
@@ -785,7 +785,7 @@ bool tty_is_vc_resolve(const char *tty) {
 }

 const char *default_term_for_tty(const char *tty) {
-        return tty && tty_is_vc_resolve(tty) ? "TERM=linux" : "TERM=vt220";
+        return tty && tty_is_vc_resolve(tty) ? "linux" : "vt220";
 }

 int fd_columns(int fd) {