diff options
| author | Erik Andersen <andersen@codepoet.org> | 2000-02-21 19:25:12 +0000 |
|---|---|---|
| committer | Erik Andersen <andersen@codepoet.org> | 2000-02-21 19:25:12 +0000 |
| commit | fa4718efcf055d8720ea99be1af237a921232f5a (patch) | |
| tree | 9315aca282f73ea18da3588a7328d4233a18e8c2 | |
| parent | 42387e496463f6dbba168b5d36807b858f94fa96 (diff) | |
Minor update for handling TERM with serial consoles.
-Erik
| -rw-r--r-- | init.c | 6 | ||||
| -rw-r--r-- | init/init.c | 6 |
2 files changed, 8 insertions, 4 deletions
@@ -314,8 +314,10 @@ static void console_init() if (ioctl(0, TIOCGSERIAL, &sr) == 0) { log = NULL; secondConsole = NULL; - /* Force the TERM setting to vt102 for serial console */ - snprintf(termType, sizeof(termType) - 1, "TERM=vt102"); + /* Force the TERM setting to vt102 for serial console -- + * iff TERM is set to linux (the default) */ + if (strcmp( termType, "TERM=linux" ) == 0) + snprintf(termType, sizeof(termType) - 1, "TERM=vt102"); message(LOG | CONSOLE, "serial console detected. Disabling virtual terminals.\r\n"); } diff --git a/init/init.c b/init/init.c index a3e165ecc..4a19822ae 100644 --- a/init/init.c +++ b/init/init.c @@ -314,8 +314,10 @@ static void console_init() if (ioctl(0, TIOCGSERIAL, &sr) == 0) { log = NULL; secondConsole = NULL; - /* Force the TERM setting to vt102 for serial console */ - snprintf(termType, sizeof(termType) - 1, "TERM=vt102"); + /* Force the TERM setting to vt102 for serial console -- + * iff TERM is set to linux (the default) */ + if (strcmp( termType, "TERM=linux" ) == 0) + snprintf(termType, sizeof(termType) - 1, "TERM=vt102"); message(LOG | CONSOLE, "serial console detected. Disabling virtual terminals.\r\n"); } |