aboutsummaryrefslogtreecommitdiff
path: root/init
diff options
context:
space:
mode:
authorEric Andersen <andersen@codepoet.org>1999-12-07 08:37:31 +0000
committerEric Andersen <andersen@codepoet.org>1999-12-07 08:37:31 +0000
commitd00c2628474b9e6a3fe34c988fe197cf2425ff1a (patch)
tree960ee0d6353cfae1ff21820f8a2d95f6c2ed08c9 /init
parent0ecb54a0f3fece5e42f089036f059973bed8d87e (diff)
downloadbusybox-d00c2628474b9e6a3fe34c988fe197cf2425ff1a.tar.gz
Stuf
Diffstat (limited to 'init')
-rw-r--r--init/init.c74
1 files changed, 51 insertions, 23 deletions
diff --git a/init/init.c b/init/init.c
index 84b558d84..dbd9f2812 100644
--- a/init/init.c
+++ b/init/init.c
@@ -55,6 +55,7 @@
#define VT_LOG "/dev/tty3" /* Virtual console */
#define SERIAL_CON0 "/dev/ttyS0" /* Primary serial console */
#define SERIAL_CON1 "/dev/ttyS1" /* Serial console */
+#define GETTY "/sbin/getty" /* Default location of getty */
#define SHELL "/bin/sh" /* Default shell */
#define INITSCRIPT "/etc/init.d/rcS" /* Initscript. */
@@ -446,15 +447,19 @@ static void reboot_signal(int sig)
extern int init_main(int argc, char **argv)
{
- int run_rc = TRUE;
- int wait_for_enter = TRUE;
+ int run_rc = FALSE;
+ int single = FALSE;
+ int wait_for_enter_tty1 = TRUE;
+ int wait_for_enter_tty2 = TRUE;
pid_t pid1 = 0;
pid_t pid2 = 0;
struct stat statbuf;
const char* const rc_script_command[] = { INITSCRIPT, INITSCRIPT, 0};
+ const char* const getty1_command[] = { GETTY, GETTY, VT_PRIMARY, 0};
+ const char* const getty2_command[] = { GETTY, GETTY, VT_SECONDARY, 0};
const char* const shell_command[] = { SHELL, "-" SHELL, 0};
- const char* const* tty0_command = shell_command;
const char* const* tty1_command = shell_command;
+ const char* const* tty2_command = shell_command;
#ifdef BB_INIT_CMD_IF_RC_SCRIPT_EXITS
const char* const rc_exit_command[] = { "BB_INIT_CMD_IF_RC_SCRIPT_EXITS",
"BB_INIT_CMD_IF_RC_SCRIPT_EXITS", 0 };
@@ -477,13 +482,6 @@ extern int init_main(int argc, char **argv)
}
#endif
- /* Check if we are supposed to be in single user mode */
- if ( argc > 1 && (!strcmp(argv[1], "single") ||
- !strcmp(argv[1], "-s") || !strcmp(argv[1], "1"))) {
- run_rc = FALSE;
- }
-
-
/* Set up sig handlers -- be sure to
* clear all of these in run() */
signal(SIGUSR1, halt_signal);
@@ -529,27 +527,55 @@ extern int init_main(int argc, char **argv)
/* Make sure there is enough memory to do something useful. */
check_memory();
+ /* Check if we are supposed to be in single user mode */
+ if ( argc > 1 && (!strcmp(argv[1], "single") ||
+ !strcmp(argv[1], "-s") || !strcmp(argv[1], "1"))) {
+ single = TRUE;
+ tty1_command = shell_command;
+ tty2_command = shell_command;
+ }
/* Make sure an init script exists before trying to run it */
- if (run_rc == TRUE && stat(INITSCRIPT, &statbuf)==0) {
- wait_for_enter = FALSE;
- tty0_command = rc_script_command;
+ if (single==FALSE && stat(INITSCRIPT, &statbuf)==0) {
+ run_rc = TRUE;
+ wait_for_enter_tty1 = FALSE;
+ tty1_command = rc_script_command;
}
+
+ /* Make sure /sbin/getty exists before trying to run it */
+ if (stat(GETTY, &statbuf)==0) {
+ char* where;
+ wait_for_enter_tty2 = FALSE;
+ where = strrchr( console, '/');
+ if ( where != NULL) {
+ strcpy( (char*)getty2_command[2], where);
+ }
+ tty2_command = getty2_command;
+ /* Check on hooking a getty onto tty1 */
+ if (run_rc == FALSE && single==FALSE) {
+ wait_for_enter_tty1 = FALSE;
+ where = strrchr( second_console, '/');
+ if ( where != NULL) {
+ strcpy( (char*)getty1_command[2], where);
+ }
+ tty1_command = getty1_command;
+ }
+ }
+
-
- /* Ok, now launch the rc script and/or prepare to
- * start up some VTs if somebody hits enter...
- */
+ /* Ok, now launch the tty1_command and tty2_command */
for (;;) {
pid_t wpid;
int status;
- if (pid1 == 0 && tty0_command) {
- pid1 = run(tty0_command, console, wait_for_enter);
+ if (pid1 == 0 && tty1_command) {
+ pid1 = run(tty1_command, console, wait_for_enter_tty1);
}
- if (pid2 == 0 && tty1_command && second_console) {
- pid2 = run(tty1_command, second_console, TRUE);
+#ifdef BB_FEATURE_INIT_SECOND_CONSOLE
+ if (pid2 == 0 && tty2_command && second_console) {
+ pid2 = run(tty2_command, second_console, wait_for_enter_tty2);
}
+#endif
wpid = wait(&status);
if (wpid > 0 ) {
message(LOG, "pid %d exited, status=%x.\n", wpid, status);
@@ -563,14 +589,16 @@ extern int init_main(int argc, char **argv)
else {
pid1 = 0;
run_rc=FALSE;
- wait_for_enter=TRUE;
- tty0_command=rc_exit_command;
+ wait_for_enter_tty1=TRUE;
+ tty1_command=rc_exit_command;
}
#endif
}
+#ifdef BB_FEATURE_INIT_SECOND_CONSOLE
if (wpid == pid2) {
pid2 = 0;
}
+#endif
sleep(1);
}
}