* archival/bunzip2.c (bunzip2_main): Do not remove files if writing to standard

[oweals/busybox.git] / init / poweroff.c

diff --git a/init/poweroff.c b/init/poweroff.c
index 126a0fb9496e81fc08c8079127a7bc7a2714f0fb..27468bac040b569a7ab78fd36220808ddb0c315f 100644 (file)
--- a/init/poweroff.c
+++ b/init/poweroff.c
@@ -2,8 +2,8 @@
 /*
  * Mini poweroff implementation for busybox
  *
- *
  * Copyright (C) 1995, 1996 by Bruce Perens <bruce@pixar.com>.
+ * Copyright (C) 1999-2002 by Erik Andersen <andersee@debian.org>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,14 +21,20 @@
  *
  */
 
-#include "internal.h"
+#include "busybox.h"
 #include <signal.h>
 
 extern int poweroff_main(int argc, char **argv)
 {
-#ifdef BB_FEATURE_LINUXRC
+#ifdef CONFIG_FEATURE_INITRD
        /* don't assume init's pid == 1 */
-       return(kill(*(findPidByName("init")), SIGUSR2));
+       long *pid = find_pid_by_name("init");
+       if (!pid || *pid<=0) {
+               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));
 #endif