Adjustments for Johns init stuff,

 -Erik

diff --git a/halt.c b/halt.c
index ecc6e8f3014afe5e06edac0bfc2aef920a60c5f1..23eb23c301009536216aa5fb836341f2ea43ffcc 100644 (file)
--- a/halt.c
+++ b/halt.c
@@ -26,6 +26,7 @@
 extern int
 halt_main(int argc, char ** argv)
 {
-    exit( kill(1, SIGUSR1));
+    /* don't assume init's pid == 1 */
+    exit( kill(findInitPid(), SIGUSR1));
 }
 

diff --git a/init/halt.c b/init/halt.c
index ecc6e8f3014afe5e06edac0bfc2aef920a60c5f1..23eb23c301009536216aa5fb836341f2ea43ffcc 100644 (file)
--- a/init/halt.c
+++ b/init/halt.c
@@ -26,6 +26,7 @@
 extern int
 halt_main(int argc, char ** argv)
 {
-    exit( kill(1, SIGUSR1));
+    /* don't assume init's pid == 1 */
+    exit( kill(findInitPid(), SIGUSR1));
 }
 

diff --git a/init/reboot.c b/init/reboot.c
index 17ec9f82ff806d17377fbbafbcd29e5f9054ec57..ff2c6ad181b26235cf52e3156ca32f3a689a438b 100644 (file)
--- a/init/reboot.c
+++ b/init/reboot.c
@@ -26,6 +26,6 @@
 extern int
 reboot_main(int argc, char ** argv)
 {
-       /* don't assume init's pid == 1 */
-       exit( kill(findInitPid(), SIGUSR2));
+    /* don't assume init's pid == 1 */
+    exit( kill(findInitPid(), SIGUSR2));
 }

diff --git a/reboot.c b/reboot.c
index 17ec9f82ff806d17377fbbafbcd29e5f9054ec57..ff2c6ad181b26235cf52e3156ca32f3a689a438b 100644 (file)
--- a/reboot.c
+++ b/reboot.c
@@ -26,6 +26,6 @@
 extern int
 reboot_main(int argc, char ** argv)
 {
-       /* don't assume init's pid == 1 */
-       exit( kill(findInitPid(), SIGUSR2));
+    /* don't assume init's pid == 1 */
+    exit( kill(findInitPid(), SIGUSR2));
 }

diff --git a/utility.c b/utility.c
index 42ee00c505c244d1e9296336aac2ddf055975227..74df632b9a7cf1ce9c71ad1b00ab55e9c60adf9a 100644 (file)
--- a/utility.c
+++ b/utility.c
@@ -1068,7 +1068,12 @@ extern long getNum (const char *cp)
 }
 #endif
 
-#if 1
+
+#if defined BB_INIT || defined BB_HALT || defined BB_REBOOT 
+
+#if ! defined BB_FEATURE_USE_PROCFS
+#error Sorry, I depend on the /proc filesystem right now.
+#endif
 /* findInitPid()
  *  
  *  This finds the pid of init (which is not always 1).
@@ -1095,7 +1100,7 @@ findInitPid()
        fgets(buffer, 256, status);
        fclose(status);
 
-       if ( (strcmp(&buffer[6], "init\n") == 0)) {
+       if ( (strstr(buffer, "init\n") != NULL )) {
            return init_pid;
        }
     }