diff options
| author | Eric Andersen | 2001-10-03 21:26:12 +0000 |
|---|---|---|
| committer | Eric Andersen | 2001-10-03 21:26:12 +0000 |
| commit | 371ca19f5346d626f0c75c8d53aa5e3fb2e85c43 (patch) | |
| tree | d5d5b8f9aec5eb15d45a43ea6a031dac4e05f39f | |
| parent | f0a4ac82166dbaedeae1d5f92821b700fc8fa17f (diff) | |
| download | busybox-371ca19f5346d626f0c75c8d53aa5e3fb2e85c43.zip busybox-371ca19f5346d626f0c75c8d53aa5e3fb2e85c43.tar.gz | |
Look for either "init" or "linuxrc" processes
| -rw-r--r-- | halt.c | 7 | ||||
| -rw-r--r-- | init/halt.c | 7 | ||||
| -rw-r--r-- | init/poweroff.c | 7 | ||||
| -rw-r--r-- | init/reboot.c | 7 | ||||
| -rw-r--r-- | poweroff.c | 7 | ||||
| -rw-r--r-- | reboot.c | 7 |
6 files changed, 30 insertions, 12 deletions
@@ -29,8 +29,11 @@ extern int halt_main(int argc, char **argv) #ifdef BB_FEATURE_LINUXRC /* don't assume init's pid == 1 */ pid_t *pid = find_pid_by_name("init"); - if (!pid || *pid<=0) - error_msg_and_die("no process killed"); + if (!pid || *pid<=0) { + pid_t *pid = find_pid_by_name("linuxrc"); + if (!pid || *pid<=0) + error_msg_and_die("no process killed"); + } return(kill(*pid, SIGUSR1)); #else return(kill(1, SIGUSR1)); diff --git a/init/halt.c b/init/halt.c index 10dcb42..a6fec02 100644 --- a/init/halt.c +++ b/init/halt.c @@ -29,8 +29,11 @@ extern int halt_main(int argc, char **argv) #ifdef BB_FEATURE_LINUXRC /* don't assume init's pid == 1 */ pid_t *pid = find_pid_by_name("init"); - if (!pid || *pid<=0) - error_msg_and_die("no process killed"); + if (!pid || *pid<=0) { + pid_t *pid = find_pid_by_name("linuxrc"); + if (!pid || *pid<=0) + error_msg_and_die("no process killed"); + } return(kill(*pid, SIGUSR1)); #else return(kill(1, SIGUSR1)); diff --git a/init/poweroff.c b/init/poweroff.c index 8bb20e9..eba5134 100644 --- a/init/poweroff.c +++ b/init/poweroff.c @@ -29,8 +29,11 @@ extern int poweroff_main(int argc, char **argv) #ifdef BB_FEATURE_LINUXRC /* don't assume init's pid == 1 */ pid_t *pid = find_pid_by_name("init"); - if (!pid || *pid<=0) - error_msg_and_die("no process killed"); + if (!pid || *pid<=0) { + pid_t *pid = find_pid_by_name("linuxrc"); + if (!pid || *pid<=0) + error_msg_and_die("no process killed"); + } return(kill(*pid, SIGUSR2)); #else return(kill(1, SIGUSR2)); diff --git a/init/reboot.c b/init/reboot.c index 35c147b..bdcd443 100644 --- a/init/reboot.c +++ b/init/reboot.c @@ -29,8 +29,11 @@ extern int reboot_main(int argc, char **argv) #ifdef BB_FEATURE_LINUXRC /* don't assume init's pid == 1 */ pid_t *pid = find_pid_by_name("init"); - if (!pid || *pid<=0) - error_msg_and_die("no process killed"); + if (!pid || *pid<=0) { + pid_t *pid = find_pid_by_name("linuxrc"); + if (!pid || *pid<=0) + error_msg_and_die("no process killed"); + } return(kill(*pid, SIGTERM)); #else return(kill(1, SIGTERM)); @@ -29,8 +29,11 @@ extern int poweroff_main(int argc, char **argv) #ifdef BB_FEATURE_LINUXRC /* don't assume init's pid == 1 */ pid_t *pid = find_pid_by_name("init"); - if (!pid || *pid<=0) - error_msg_and_die("no process killed"); + if (!pid || *pid<=0) { + pid_t *pid = find_pid_by_name("linuxrc"); + if (!pid || *pid<=0) + error_msg_and_die("no process killed"); + } return(kill(*pid, SIGUSR2)); #else return(kill(1, SIGUSR2)); @@ -29,8 +29,11 @@ extern int reboot_main(int argc, char **argv) #ifdef BB_FEATURE_LINUXRC /* don't assume init's pid == 1 */ pid_t *pid = find_pid_by_name("init"); - if (!pid || *pid<=0) - error_msg_and_die("no process killed"); + if (!pid || *pid<=0) { + pid_t *pid = find_pid_by_name("linuxrc"); + if (!pid || *pid<=0) + error_msg_and_die("no process killed"); + } return(kill(*pid, SIGTERM)); #else return(kill(1, SIGTERM)); |