work in progress...

[oweals/busybox.git] / init.c

diff --git a/init.c b/init.c
index 164ee69a32a2742eaee180aea6b984e4035451eb..561b5fd527186feddd823c743badb27c3b56cd4a 100644 (file)
--- a/init.c
+++ b/init.c
@@ -41,6 +41,7 @@
 #include <linux/serial.h>      /* for serial_struct */
 #include <sys/vt.h>            /* for vt_stat */
 #include <sys/ioctl.h>
+#include <linux/version.h>
 #ifdef BB_SYSLOGD
 #include <sys/syslog.h>
 #endif
@@ -49,6 +50,10 @@
 #error Sorry, I depend on the /proc filesystem right now.
 #endif
 
+#ifndef KERNEL_VERSION
+#define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))
+#endif
+
 
 #define VT_PRIMARY      "/dev/tty1"    /* Primary virtual console */
 #define VT_SECONDARY    "/dev/tty2"    /* Virtual console */
@@ -57,7 +62,9 @@
 #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. */
+#ifndef BB_INIT_SCRIPT
+#define BB_INIT_SCRIPT "/etc/init.d/rcS"       /* Initscript. */
+#endif
 
 #define LOG             0x1
 #define CONSOLE         0x2
@@ -336,9 +343,9 @@ static pid_t run(const char * const* command,
        }
 
        /* Log the process name and args */
-       message(LOG, "Starting pid %d, console %s: '", getpid(), terminal);
-       while ( *cmd) message(LOG, "%s ", *cmd++);
-       message(LOG, "'\r\n");
+       message(LOG|CONSOLE, "Starting pid %d, console %s: '", getpid(), terminal);
+       while ( *cmd) message(LOG|CONSOLE, "%s ", *cmd++);
+       message(LOG|CONSOLE, "'\r\n");
        
        /* Now run it.  The new program will take over this PID, 
         * so nothing further in init.c should be run. */
@@ -418,9 +425,12 @@ static void halt_signal(int sig)
            "The system is halted. Press CTRL-ALT-DEL or turn off power\r\n");
     sync();
 #ifndef DEBUG_INIT
-    while (1) sleep(1);
-    reboot(RB_HALT_SYSTEM);
-    //reboot(RB_POWER_OFF);
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,2,0)
+    if (sig == SIGUSR2)
+       reboot(RB_POWER_OFF);
+    else
+#endif
+       reboot(RB_HALT_SYSTEM);
 #endif
     exit(0);
 }
@@ -430,7 +440,6 @@ static void reboot_signal(int sig)
     shutdown_system();
     message(CONSOLE, "Please stand by while rebooting the system.\r\n");
     sync();
-    while (1) sleep(1);
 #ifndef DEBUG_INIT
     reboot(RB_AUTOBOOT);
 #endif
@@ -446,9 +455,11 @@ extern int init_main(int argc, char **argv)
     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};
+    char which_vt1[30];
+    char which_vt2[30];
+    const char* const rc_script_command[] = { BB_INIT_SCRIPT, BB_INIT_SCRIPT, 0};
+    const char* const getty1_command[] = { GETTY, GETTY, "38400", which_vt1, 0};
+    const char* const getty2_command[] = { GETTY, GETTY, "38400", which_vt2, 0};
     const char* const shell_command[] = { SHELL, "-" SHELL, 0};
     const char* const* tty1_command = shell_command;
     const char* const* tty2_command = shell_command;
@@ -528,7 +539,7 @@ extern int init_main(int argc, char **argv)
     }
 
     /* Make sure an init script exists before trying to run it */
-    if (single==FALSE && stat(INITSCRIPT, &statbuf)==0) {
+    if (single==FALSE && stat(BB_INIT_SCRIPT, &statbuf)==0) {
        run_rc = TRUE;
        wait_for_enter_tty1 = FALSE;
        tty1_command = rc_script_command;
@@ -537,18 +548,22 @@ extern int init_main(int argc, char **argv)
     /* Make sure /sbin/getty exists before trying to run it */
     if (stat(GETTY, &statbuf)==0) {
        char* where;
+       /* First do tty2 */
        wait_for_enter_tty2 = FALSE;
-       where = strrchr( console, '/');
+       where = strrchr( second_console, '/');
        if ( where != NULL) {
-           strcpy( (char*)getty2_command[2], where);
+           where++;
+           strncpy( which_vt2, where, sizeof(which_vt2));
        }
        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, '/');
+           where = strrchr( console, '/');
            if ( where != NULL) {
-               strcpy( (char*)getty1_command[2], where);
+               where++;
+               strncpy( which_vt1, where, sizeof(which_vt1));
            }
            tty1_command = getty1_command;
        }