aboutsummaryrefslogtreecommitdiff
path: root/init
diff options
context:
space:
mode:
authorGravatar Paul Fox <pgf@brightstareng.com>2006-06-01 13:17:49 +0000
committerGravatar Paul Fox <pgf@brightstareng.com>2006-06-01 13:17:49 +0000
commitd112f8fa5e28fe21cf375d4dc3307dcfbdb3a300 (patch)
tree1f9fd1a6420c2c3c0461f76ef4e5b497a614c388 /init
parent8fc32d9326be21e4f5fb19762ba2bb38081153d5 (diff)
downloadbusybox-d112f8fa5e28fe21cf375d4dc3307dcfbdb3a300.tar.gz
busybox-d112f8fa5e28fe21cf375d4dc3307dcfbdb3a300.tar.bz2
make halt and poweroff messages more accurate (i.e., claim "we're about to",
rather than "it's done", and combine with reboot handler to save space.
Diffstat (limited to 'init')
-rw-r--r--init/init.c45
1 files changed, 21 insertions, 24 deletions
diff --git a/init/init.c b/init/init.c
index d072a2209..0290f667a 100644
--- a/init/init.c
+++ b/init/init.c
@@ -175,7 +175,7 @@ static const char * const environment[] = {
/* Function prototypes */
static void delete_init_action(struct init_action *a);
static int waitfor(const struct init_action *a, pid_t pid);
-static void halt_signal(int sig);
+static void shutdown_signal(int sig);
static void loop_forever(void)
@@ -395,7 +395,7 @@ static void open_new_terminal(const char *device, char fail) {
if (fail)
_exit(1);
/* else */
- halt_signal(SIGUSR1);
+ shutdown_signal(SIGUSR1);
}
}
@@ -746,33 +746,30 @@ static void exec_signal(int sig ATTRIBUTE_UNUSED)
}
}
-static void halt_signal(int sig ATTRIBUTE_UNUSED)
+static void shutdown_signal(int sig)
{
- shutdown_system();
- message(CONSOLE | LOG, "The system is halted.");
- sync();
+ char *m;
+ int rb;
- /* allow time for last message to reach serial console */
- sleep(2);
-
- if (sig == SIGUSR2)
- init_reboot(RB_POWER_OFF);
- else
- init_reboot(RB_HALT_SYSTEM);
-
- loop_forever();
-}
-
-static void reboot_signal(int sig ATTRIBUTE_UNUSED)
-{
shutdown_system();
- message(CONSOLE | LOG, "Please stand by while rebooting the system.");
+
+ if (sig == SIGTERM) {
+ m = "reboot";
+ rb = RB_AUTOBOOT;
+ } else if (sig == SIGUSR2) {
+ m = "poweroff";
+ rb = RB_POWER_OFF;
+ } else {
+ m = "halt";
+ rb = RB_HALT_SYSTEM;
+ }
+ message(CONSOLE | LOG, "Requesting system %s.", m);
sync();
/* allow time for last message to reach serial console */
sleep(2);
- init_reboot(RB_AUTOBOOT);
+ init_reboot(rb);
loop_forever();
}
@@ -1020,10 +1017,10 @@ int init_main(int argc, char **argv)
* clear all of these in run() */
signal(SIGHUP, exec_signal);
signal(SIGQUIT, exec_signal);
- signal(SIGUSR1, halt_signal);
- signal(SIGUSR2, halt_signal);
+ signal(SIGUSR1, shutdown_signal);
+ signal(SIGUSR2, shutdown_signal);
signal(SIGINT, ctrlaltdel_signal);
- signal(SIGTERM, reboot_signal);
+ signal(SIGTERM, shutdown_signal);
signal(SIGCONT, cont_handler);
signal(SIGSTOP, stop_handler);
signal(SIGTSTP, stop_handler);