Remove debugging statement.

[oweals/busybox.git] / init.c

diff --git a/init.c b/init.c
index c26314c8be9b5dfaf2b743d6a9d47fac9fb02483..e057caa7e6b0d304441400b4d1dbd44ded910cb2 100644 (file)
--- a/init.c
+++ b/init.c
@@ -124,7 +124,8 @@ static const int RB_AUTOBOOT = 0x01234567;
 #define VT_LOG       "/dev/tty5"     /* Virtual console */
 #define SERIAL_CON0  "/dev/ttyS0"    /* Primary serial console */
 #define SERIAL_CON1  "/dev/ttyS1"    /* Serial console */
-#define SHELL        "-/bin/sh"             /* Default shell */
+#define SHELL        "/bin/sh"      /* Default shell */
+#define LOGIN_SHELL  "-" SHELL      /* Default login shell */
 #define INITTAB      "/etc/inittab"  /* inittab file location */
 #ifndef INIT_SCRIPT
 #define INIT_SCRIPT  "/etc/init.d/rcS"   /* Default sysinit script. */
@@ -185,7 +186,11 @@ static char console[32]    = _PATH_CONSOLE;
 
 static void delete_initAction(initAction * action);
 
-
+static void loop_forever()
+{
+       while (1)
+               sleep (1);
+}
 
 /* Print a message to the specified device.
  * Device may be bitwise-or'd from LOG | CONSOLE */
@@ -431,7 +436,7 @@ static pid_t run(char *command, char *terminal, int get_enter)
                termType,
                "HOME=/",
                "PATH=/usr/bin:/bin:/usr/sbin:/sbin",
-               "SHELL=/bin/sh",
+               "SHELL=" SHELL,
                "USER=root",
                NULL
        };
@@ -611,8 +616,7 @@ static void check_memory()
   goodnight:
        message(CONSOLE,
                        "Sorry, your computer does not have enough memory.\r\n");
-       while (1)
-               sleep(1);
+       loop_forever();
 }
 
 /* Run all commands to be run right before halt/reboot */
@@ -679,7 +683,8 @@ static void halt_signal(int sig)
                init_reboot(RB_POWER_OFF);
        else
                init_reboot(RB_HALT_SYSTEM);
-       exit(0);
+
+       loop_forever();
 }
 
 static void reboot_signal(int sig)
@@ -692,7 +697,8 @@ static void reboot_signal(int sig)
        sleep(2);
 
        init_reboot(RB_AUTOBOOT);
-       exit(0);
+
+       loop_forever();
 }
 
 static void ctrlaltdel_signal(int sig)
@@ -720,8 +726,7 @@ static void new_initAction(initActionEnum action, char *process, char *cons)
        newAction = calloc((size_t) (1), sizeof(initAction));
        if (!newAction) {
                message(LOG | CONSOLE, "Memory allocation failure\n");
-               while (1)
-                       sleep(1);
+               loop_forever();
        }
        newAction->nextPtr = initActionList;
        initActionList = newAction;
@@ -752,7 +757,7 @@ static void delete_initAction(initAction * action)
 
 /* NOTE that if BB_FEATURE_USE_INITTAB is NOT defined,
  * then parse_inittab() simply adds in some default
- * actions(i.e runs INIT_SCRIPT and then starts a pair 
+ * actions(i.e., runs INIT_SCRIPT and then starts a pair 
  * of "askfirst" shells).  If BB_FEATURE_USE_INITTAB 
  * _is_ defined, but /etc/inittab is missing, this 
  * results in the same set of default behaviors.
@@ -778,16 +783,16 @@ static void parse_inittab(void)
                /* Umount all filesystems on halt/reboot */
                new_initAction(SHUTDOWN, "/bin/umount -a -r", console);
                /* Askfirst shell on tty1 */
-               new_initAction(ASKFIRST, SHELL, console);
+               new_initAction(ASKFIRST, LOGIN_SHELL, console);
                /* Askfirst shell on tty2 */
                if (secondConsole != NULL)
-                       new_initAction(ASKFIRST, SHELL, secondConsole);
+                       new_initAction(ASKFIRST, LOGIN_SHELL, secondConsole);
                /* Askfirst shell on tty3 */
                if (thirdConsole != NULL)
-                       new_initAction(ASKFIRST, SHELL, thirdConsole);
+                       new_initAction(ASKFIRST, LOGIN_SHELL, thirdConsole);
                /* Askfirst shell on tty4 */
                if (fourthConsole != NULL)
-                       new_initAction(ASKFIRST, SHELL, fourthConsole);
+                       new_initAction(ASKFIRST, LOGIN_SHELL, fourthConsole);
                /* sysinit */
                new_initAction(SYSINIT, INIT_SCRIPT, console);
 
@@ -940,19 +945,19 @@ extern int init_main(int argc, char **argv)
                                         !strcmp(argv[1], "-s") || !strcmp(argv[1], "1"))) {
                /* Ask first then start a shell on tty2-4 */
                if (secondConsole != NULL)
-                       new_initAction(ASKFIRST, SHELL, secondConsole);
+                       new_initAction(ASKFIRST, LOGIN_SHELL, secondConsole);
                if (thirdConsole != NULL)
-                       new_initAction(ASKFIRST, SHELL, thirdConsole);
+                       new_initAction(ASKFIRST, LOGIN_SHELL, thirdConsole);
                if (fourthConsole != NULL)
-                       new_initAction(ASKFIRST, SHELL, fourthConsole);
+                       new_initAction(ASKFIRST, LOGIN_SHELL, fourthConsole);
                /* Start a shell on tty1 */
-               new_initAction(RESPAWN, SHELL, console);
+               new_initAction(RESPAWN, LOGIN_SHELL, console);
        } else {
                /* Not in single user mode -- see what inittab says */
 
                /* NOTE that if BB_FEATURE_USE_INITTAB is NOT defined,
                 * then parse_inittab() simply adds in some default
-                * actions(i.e runs INIT_SCRIPT and then starts a pair 
+                * actions(i.e., runs INIT_SCRIPT and then starts a pair 
                 * of "askfirst" shells */
                parse_inittab();
        }
@@ -993,8 +998,7 @@ extern int init_main(int argc, char **argv)
        if (initActionList == NULL) {
                message(LOG | CONSOLE,
                                "No more tasks for init -- sleeping forever.\n");
-               while (1)
-                       sleep(1);
+               loop_forever();
        }
 
        /* Now run the looping stuff for the rest of forever */