findInitPid() has been implemented and it seems to work.

    reboot has been changed to take advantage of findInitPid();

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

diff --git a/internal.h b/internal.h
index 830d30eb444a25af7828d433fabb4f77622ca05a..de13bb202cb342aa79cbf7ab327f65528db1fb0e 100644 (file)
--- a/internal.h
+++ b/internal.h
@@ -157,6 +157,7 @@ extern void write_mtab(char* blockDevice, char* directory,
 extern void erase_mtab(const char * name);
 extern int check_wildcard_match(const char* text, const char* pattern);
 extern long getNum (const char *cp);
+extern pid_t findInitPid();
 
 
 #if defined BB_MTAB

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

diff --git a/utility.c b/utility.c
index de7a0fbfc639bce0c62f791609bd4aed1cee6dde..42ee00c505c244d1e9296336aac2ddf055975227 100644 (file)
--- a/utility.c
+++ b/utility.c
@@ -1068,14 +1068,39 @@ extern long getNum (const char *cp)
 }
 #endif
 
+#if 1
+/* findInitPid()
+ *  
+ *  This finds the pid of init (which is not always 1).
+ *  Currently, it's implemented by rummaging through the proc filesystem.
+ *
+ *  [return]
+ *  0      failure
+ *  pid            when init's pid is found.
+ */
+extern pid_t
+findInitPid()
+{
+    pid_t   init_pid;
+    char    filename[256];
+    char    buffer[256];
+
+    /* no need to opendir ;) */
+    for (init_pid = 1; init_pid < 65536; init_pid++) {
+       FILE    *status;
+
+       sprintf(filename, "/proc/%d/status", init_pid);
+       status = fopen(filename, "r");
+       if (!status) { continue; }
+       fgets(buffer, 256, status);
+       fclose(status);
+
+       if ( (strcmp(&buffer[6], "init\n") == 0)) {
+           return init_pid;
+       }
+    }
+    return 0;
+}
+#endif
 
 /* END CODE */
-
-
-
-
-
-
-
-
-