work in progress...

[oweals/busybox.git] / init.c

diff --git a/init.c b/init.c
index 5203713ca756aba2abfa6d74a7a5e478e543e4ef..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
@@ -418,9 +425,11 @@ static void halt_signal(int sig)
            "The system is halted. Press CTRL-ALT-DEL or turn off power\r\n");
     sync();
 #ifndef DEBUG_INIT
+#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);
@@ -448,7 +457,7 @@ extern int init_main(int argc, char **argv)
     struct stat statbuf;
     char which_vt1[30];
     char which_vt2[30];
-    const char* const rc_script_command[] = { INITSCRIPT, INITSCRIPT, 0};
+    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};
@@ -530,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;