summaryrefslogtreecommitdiff
path: root/init
diff options
context:
space:
mode:
authorErik Andersen2000-03-07 23:32:17 +0000
committerErik Andersen2000-03-07 23:32:17 +0000
commit2ac2fae728cca8a535b29bdd2fa6899e6f4992f2 (patch)
tree76eb5871ac3cde7d58048aadba75c7f40fab93b7 /init
parentcbd0d625c7466af80f141e0ae24186e15987bf3e (diff)
downloadbusybox-2ac2fae728cca8a535b29bdd2fa6899e6f4992f2.zip
busybox-2ac2fae728cca8a535b29bdd2fa6899e6f4992f2.tar.gz
Fix bugs related to finding PIDs.
-Erik
Diffstat (limited to 'init')
-rw-r--r--init/halt.c4
-rw-r--r--init/init.c6
-rw-r--r--init/poweroff.c4
-rw-r--r--init/reboot.c4
4 files changed, 13 insertions, 5 deletions
diff --git a/init/halt.c b/init/halt.c
index f2c9828..81d24cf 100644
--- a/init/halt.c
+++ b/init/halt.c
@@ -26,6 +26,10 @@
extern int halt_main(int argc, char **argv)
{
+#ifdef BB_FEATURE_LINUXRC
/* don't assume init's pid == 1 */
exit(kill(findPidByName("init"), SIGUSR1));
+#else
+ exit(kill(1, SIGUSR1));
+#endif
}
diff --git a/init/init.c b/init/init.c
index 8e28f07..c6052f8 100644
--- a/init/init.c
+++ b/init/init.c
@@ -336,10 +336,6 @@ static pid_t run(char *command, char *terminal, int get_enter)
if ((pid = fork()) == 0) {
-#ifdef DEBUG_INIT
- pid_t shell_pgid = getpid();
-#endif
-
/* Clean up */
close(0);
close(1);
@@ -373,8 +369,8 @@ static pid_t run(char *command, char *terminal, int get_enter)
* specifies.
*/
char c;
-
#ifdef DEBUG_INIT
+ pid_t shell_pgid = getpid();
message(LOG, "Waiting for enter to start '%s' (pid %d, console %s)\r\n",
command, shell_pgid, terminal);
#endif
diff --git a/init/poweroff.c b/init/poweroff.c
index 14dc2f5..0f23b95 100644
--- a/init/poweroff.c
+++ b/init/poweroff.c
@@ -26,6 +26,10 @@
extern int poweroff_main(int argc, char **argv)
{
+#ifdef BB_FEATURE_LINUXRC
/* don't assume init's pid == 1 */
exit(kill(findPidByName("init"), SIGUSR2));
+#else
+ exit(kill(1, SIGUSR2));
+#endif
}
diff --git a/init/reboot.c b/init/reboot.c
index fc01ea0..2f8b2b4 100644
--- a/init/reboot.c
+++ b/init/reboot.c
@@ -26,8 +26,12 @@
extern int reboot_main(int argc, char **argv)
{
+#ifdef BB_FEATURE_LINUXRC
/* don't assume init's pid == 1 */
exit(kill(findPidByName("init"), SIGINT));
+#else
+ exit(kill(1, SIGINT));
+#endif
}
/*