diff options
Diffstat (limited to 'init')
-rw-r--r-- | init/init.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/init/init.c b/init/init.c index b3d1f6d36..877b08122 100644 --- a/init/init.c +++ b/init/init.c | |||
@@ -312,15 +312,6 @@ static void console_init(void) | |||
312 | 312 | ||
313 | if ((s = getenv("CONSOLE")) != NULL || (s = getenv("console")) != NULL) { | 313 | if ((s = getenv("CONSOLE")) != NULL || (s = getenv("console")) != NULL) { |
314 | safe_strncpy(console, s, sizeof(console)); | 314 | safe_strncpy(console, s, sizeof(console)); |
315 | #if 0 /* #cpu(sparc) */ | ||
316 | /* sparc kernel supports console=tty[ab] parameter which is also | ||
317 | * passed to init, so catch it here */ | ||
318 | /* remap tty[ab] to /dev/ttyS[01] */ | ||
319 | if (strcmp(s, "ttya") == 0) | ||
320 | safe_strncpy(console, SC_0, sizeof(console)); | ||
321 | else if (strcmp(s, "ttyb") == 0) | ||
322 | safe_strncpy(console, SC_1, sizeof(console)); | ||
323 | #endif | ||
324 | } else { | 315 | } else { |
325 | /* 2.2 kernels: identify the real console backend and try to use it */ | 316 | /* 2.2 kernels: identify the real console backend and try to use it */ |
326 | if (ioctl(0, TIOCGSERIAL, &sr) == 0) { | 317 | if (ioctl(0, TIOCGSERIAL, &sr) == 0) { |
@@ -842,9 +833,6 @@ static void new_init_action(int action, const char *command, const char *cons) | |||
842 | strcpy(new_action->command, command); | 833 | strcpy(new_action->command, command); |
843 | new_action->action = action; | 834 | new_action->action = action; |
844 | strcpy(new_action->terminal, cons); | 835 | strcpy(new_action->terminal, cons); |
845 | #if 0 /* calloc zeroed always */ | ||
846 | new_action->pid = 0; | ||
847 | #endif | ||
848 | messageD(LOG|CONSOLE, "command='%s' action='%d' terminal='%s'\n", | 836 | messageD(LOG|CONSOLE, "command='%s' action='%d' terminal='%s'\n", |
849 | new_action->command, new_action->action, new_action->terminal); | 837 | new_action->command, new_action->action, new_action->terminal); |
850 | } | 838 | } |