diff options
| author | Rob Landley | 2006-01-30 08:31:37 +0000 |
|---|---|---|
| committer | Rob Landley | 2006-01-30 08:31:37 +0000 |
| commit | 646129163a26171d48a335f7e22828848cf28cc5 (patch) | |
| tree | 1e57cdfe9be4ec15c27276389a760f3ad6b5ab34 /init/init.c | |
| parent | 49576c0018358beda0e79e0ebb247b90e347e6e0 (diff) | |
| download | busybox-646129163a26171d48a335f7e22828848cf28cc5.zip busybox-646129163a26171d48a335f7e22828848cf28cc5.tar.gz | |
Re-add initrd support, unify halt/reboot/poweroff, add -n and -f options.
Diffstat (limited to 'init/init.c')
| -rw-r--r-- | init/init.c | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/init/init.c b/init/init.c index 337d31c..0db3554 100644 --- a/init/init.c +++ b/init/init.c @@ -751,14 +751,7 @@ static void exec_signal(int sig) static void halt_signal(int sig) { shutdown_system(); - message(CONSOLE | LOG, -#if #cpu(s390) - /* Seems the s390 console is Wierd(tm). */ - "The system is halted. You may reboot now." -#else - "The system is halted. Press Reset or turn off power" -#endif - ); + message(CONSOLE | LOG, "The system is halted."); sync(); /* allow time for last message to reach serial console */ @@ -1024,11 +1017,9 @@ extern int init_main(int argc, char **argv) } #ifndef DEBUG_INIT /* Expect to be invoked as init with PID=1 or be invoked as linuxrc */ - if (getpid() != 1 -#ifdef CONFIG_FEATURE_INITRD - && strstr(bb_applet_name, "linuxrc") == NULL -#endif - ) { + if (getpid() != 1 && + (!ENABLE_FEATURE_INITRD || !strstr(bb_applet_name, "linuxrc"))) + { bb_show_usage(); } /* Set up sig handlers -- be sure to |