diff options
author | Erik Andersen <andersen@codepoet.org> | 2000-02-18 21:34:17 +0000 |
---|---|---|
committer | Erik Andersen <andersen@codepoet.org> | 2000-02-18 21:34:17 +0000 |
commit | e272915e1ffd6978ef3555ce4ae1798a9fbcee56 (patch) | |
tree | ab4773383a4ed9ee5ccb52b58f981267e15db6e0 /init | |
parent | bf5f009862f8dbc6d767c17064380790a047cce1 (diff) | |
download | busybox-w32-e272915e1ffd6978ef3555ce4ae1798a9fbcee56.tar.gz busybox-w32-e272915e1ffd6978ef3555ce4ae1798a9fbcee56.tar.bz2 busybox-w32-e272915e1ffd6978ef3555ce4ae1798a9fbcee56.zip |
Some updates for the day,
-Erik
Diffstat (limited to 'init')
-rw-r--r-- | init/init.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/init/init.c b/init/init.c index b59e9a147..a3e165ecc 100644 --- a/init/init.c +++ b/init/init.c | |||
@@ -118,7 +118,7 @@ initAction *initActionList = NULL; | |||
118 | static char *secondConsole = VT_SECONDARY; | 118 | static char *secondConsole = VT_SECONDARY; |
119 | static char *log = VT_LOG; | 119 | static char *log = VT_LOG; |
120 | static int kernelVersion = 0; | 120 | static int kernelVersion = 0; |
121 | static char termType[32] = "TERM=ansi"; | 121 | static char termType[32] = "TERM=linux"; |
122 | static char console[32] = _PATH_CONSOLE; | 122 | static char console[32] = _PATH_CONSOLE; |
123 | static void delete_initAction(initAction * action); | 123 | static void delete_initAction(initAction * action); |
124 | 124 | ||
@@ -314,6 +314,8 @@ static void console_init() | |||
314 | if (ioctl(0, TIOCGSERIAL, &sr) == 0) { | 314 | if (ioctl(0, TIOCGSERIAL, &sr) == 0) { |
315 | log = NULL; | 315 | log = NULL; |
316 | secondConsole = NULL; | 316 | secondConsole = NULL; |
317 | /* Force the TERM setting to vt102 for serial console */ | ||
318 | snprintf(termType, sizeof(termType) - 1, "TERM=vt102"); | ||
317 | message(LOG | CONSOLE, | 319 | message(LOG | CONSOLE, |
318 | "serial console detected. Disabling virtual terminals.\r\n"); | 320 | "serial console detected. Disabling virtual terminals.\r\n"); |
319 | } | 321 | } |
@@ -839,11 +841,11 @@ extern int init_main(int argc, char **argv) | |||
839 | 841 | ||
840 | /* Hello world */ | 842 | /* Hello world */ |
841 | #ifndef DEBUG_INIT | 843 | #ifndef DEBUG_INIT |
842 | message(LOG | CONSOLE, | 844 | message(LOG, |
843 | "init started: BusyBox v%s (%s) multi-call binary\r\n", | 845 | "init started: BusyBox v%s (%s) multi-call binary\r\n", |
844 | BB_VER, BB_BT); | 846 | BB_VER, BB_BT); |
845 | #else | 847 | #else |
846 | message(LOG | CONSOLE, | 848 | message(LOG, |
847 | "init(%d) started: BusyBox v%s (%s) multi-call binary\r\n", | 849 | "init(%d) started: BusyBox v%s (%s) multi-call binary\r\n", |
848 | getpid(), BB_VER, BB_BT); | 850 | getpid(), BB_VER, BB_BT); |
849 | #endif | 851 | #endif |
@@ -851,7 +853,7 @@ extern int init_main(int argc, char **argv) | |||
851 | 853 | ||
852 | /* Mount /proc */ | 854 | /* Mount /proc */ |
853 | if (mount("proc", "/proc", "proc", 0, 0) == 0) { | 855 | if (mount("proc", "/proc", "proc", 0, 0) == 0) { |
854 | message(LOG | CONSOLE, "Mounting /proc: done.\n"); | 856 | message(LOG, "Mounting /proc: done.\n"); |
855 | kernelVersion = get_kernel_revision(); | 857 | kernelVersion = get_kernel_revision(); |
856 | } else | 858 | } else |
857 | message(LOG | CONSOLE, "Mounting /proc: failed!\n"); | 859 | message(LOG | CONSOLE, "Mounting /proc: failed!\n"); |