aboutsummaryrefslogtreecommitdiff
path: root/init
diff options
context:
space:
mode:
authorGravatar Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>2006-05-29 13:08:35 +0000
committerGravatar Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>2006-05-29 13:08:35 +0000
commit35e1a077d65f53af34f80e490efbeb2eecc6958a (patch)
treefe96a45c97f80dd32b27509cefab7098ed276912 /init
parent76bb97c995a52afdc8f5dc47b34784ebc23132a6 (diff)
downloadbusybox-35e1a077d65f53af34f80e490efbeb2eecc6958a.tar.gz
busybox-35e1a077d65f53af34f80e490efbeb2eecc6958a.tar.bz2
- DEBUG_INIT -> config CONFIG_DEBUG_INIT
Diffstat (limited to 'init')
-rw-r--r--init/Config.in8
-rw-r--r--init/init.c21
2 files changed, 16 insertions, 13 deletions
diff --git a/init/Config.in b/init/Config.in
index 113747133..8b9179124 100644
--- a/init/Config.in
+++ b/init/Config.in
@@ -11,6 +11,14 @@ config CONFIG_INIT
help
init is the first program run when the system boots.
+config CONFIG_DEBUG_INIT
+ bool "debugging aid"
+ default n
+ depends on CONFIG_INIT
+ help
+ Turn this on to disable all the dangerous
+ rebooting stuff when debugging.
+
config CONFIG_FEATURE_USE_INITTAB
bool "Support reading an inittab file"
default y
diff --git a/init/init.c b/init/init.c
index 928f84b91..10cb015dd 100644
--- a/init/init.c
+++ b/init/init.c
@@ -9,11 +9,6 @@
* Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
*/
-/* Turn this on to disable all the dangerous
- rebooting stuff when debugging.
-#define DEBUG_INIT
-*/
-
#include <stdio.h>
#include <stdlib.h>
#include <errno.h>
@@ -191,13 +186,13 @@ static void loop_forever(void)
/* Print a message to the specified device.
* Device may be bitwise-or'd from LOG | CONSOLE */
-#ifndef DEBUG_INIT
-static inline void messageD(int ATTRIBUTE_UNUSED device,
+#if ENABLE_DEBUG_INIT
+#define messageD message
+#else
+static inline void messageD(int ATTRIBUTE_UNUSED device,
const char ATTRIBUTE_UNUSED *fmt, ...)
{
}
-#else
-#define messageD message
#endif
static void message(int device, const char *fmt, ...)
__attribute__ ((format(printf, 2, 3)));
@@ -253,7 +248,7 @@ static void message(int device, const char *fmt, ...)
if (fd >= 0) {
bb_full_write(fd, msg, l);
close(fd);
-#ifdef DEBUG_INIT
+#if ENABLE_DEBUG_INIT
/* all descriptors may be closed */
} else {
bb_error_msg("Bummer, can't print: ");
@@ -655,7 +650,7 @@ static void run_actions(int action)
}
}
-#ifndef DEBUG_INIT
+#if !ENABLE_DEBUG_INIT
static void init_reboot(unsigned long magic)
{
pid_t pid;
@@ -816,7 +811,7 @@ static void cont_handler(int sig ATTRIBUTE_UNUSED)
got_cont = 1;
}
-#endif /* ! DEBUG_INIT */
+#endif /* ! ENABLE_DEBUG_INIT */
static void new_init_action(int action, const char *command, const char *cons)
{
@@ -1026,7 +1021,7 @@ int init_main(int argc, char **argv)
if (argc > 1 && !strcmp(argv[1], "-q")) {
return kill(1,SIGHUP);
}
-#ifndef DEBUG_INIT
+#if !ENABLE_DEBUG_INIT
/* Expect to be invoked as init with PID=1 or be invoked as linuxrc */
if (getpid() != 1 &&
(!ENABLE_FEATURE_INITRD || !strstr(bb_applet_name, "linuxrc")))