Commit 3030ccd7 authored by Lennart Poettering's avatar Lennart Poettering
Browse files

util: when determining the right TERM for /dev/console consult /sys/class/tty/console/active

parent 2633eb83
......@@ -3550,18 +3550,28 @@ void filter_environ(const char *prefix) {
}
const char *default_term_for_tty(const char *tty) {
char *active = NULL;
const char *term;
assert(tty);
if (startswith(tty, "/dev/"))
tty += 5;
if (startswith(tty, "tty") &&
tty[3] >= '0' && tty[3] <= '9')
return "TERM=linux";
/* Resolve where /dev/console is pointing when determining
* TERM */
if (streq(tty, "console"))
if (read_one_line_file("/sys/class/tty/console/active", &active) >= 0) {
truncate_nl(active);
tty = active;
}
term = (startswith(tty, "tty") &&
tty[3] >= '0' && tty[3] <= '9') ? "TERM=linux" : "TERM=vt100";
/* FIXME: Proper handling of /dev/console would be cool */
free(active);
return "TERM=vt100";
return term;
}
bool running_in_vm(void) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment