summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErik Andersen1999-12-21 02:54:37 +0000
committerErik Andersen1999-12-21 02:54:37 +0000
commitf294a0288d5f90616c5a096c2236442394112daa (patch)
tree2cbac40fef551950f2ec75ea00ab4a3f5e079d22
parent021043205c55677a31929594977342e96d459a6c (diff)
downloadbusybox-f294a0288d5f90616c5a096c2236442394112daa.zip
busybox-f294a0288d5f90616c5a096c2236442394112daa.tar.gz
Fix double quoting bug preventing ininit scripts from running
-rw-r--r--init.c8
-rw-r--r--init/init.c8
2 files changed, 10 insertions, 6 deletions
diff --git a/init.c b/init.c
index ba65f51..561b5fd 100644
--- a/init.c
+++ b/init.c
@@ -62,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
@@ -455,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};
@@ -537,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;
diff --git a/init/init.c b/init/init.c
index ba65f51..561b5fd 100644
--- a/init/init.c
+++ b/init/init.c
@@ -62,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
@@ -455,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};
@@ -537,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;