Merge pull request #1047 from poettering/machinectl-TERM

machinectl: pass $TERM into "machinectl shell" sessions
2015-08-26 11:55:48 +02:00
parent be5afe9f5f 89fec31893
commit 86d17e1d73
1 changed files with 11 additions and 0 deletions
@@ -1309,6 +1309,17 @@ static int shell_machine(int argc, char *argv[], void *userdata) {
                return -EOPNOTSUPP;
        }

+        /* Pass $TERM to shell session, if not explicitly specified. */
+        if (!strv_find_prefix(arg_setenv, "TERM=")) {
+                const char *t;
+
+                t = strv_find_prefix(environ, "TERM=");
+                if (t) {
+                        if (strv_extend(&arg_setenv, t) < 0)
+                                return log_oom();
+                }
+        }
+
        polkit_agent_open_if_enabled();

        r = sd_event_default(&event);