Adjustments for Johns init stuff,
-Erik
This commit is contained in:
parent
f95ca97d1b
commit
6805d5d69e
3
halt.c
3
halt.c
@ -26,6 +26,7 @@
|
|||||||
extern int
|
extern int
|
||||||
halt_main(int argc, char ** argv)
|
halt_main(int argc, char ** argv)
|
||||||
{
|
{
|
||||||
exit( kill(1, SIGUSR1));
|
/* don't assume init's pid == 1 */
|
||||||
|
exit( kill(findInitPid(), SIGUSR1));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -26,6 +26,7 @@
|
|||||||
extern int
|
extern int
|
||||||
halt_main(int argc, char ** argv)
|
halt_main(int argc, char ** argv)
|
||||||
{
|
{
|
||||||
exit( kill(1, SIGUSR1));
|
/* don't assume init's pid == 1 */
|
||||||
|
exit( kill(findInitPid(), SIGUSR1));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1068,7 +1068,12 @@ extern long getNum (const char *cp)
|
|||||||
}
|
}
|
||||||
#endif
|
#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()
|
/* findInitPid()
|
||||||
*
|
*
|
||||||
* This finds the pid of init (which is not always 1).
|
* This finds the pid of init (which is not always 1).
|
||||||
@ -1095,7 +1100,7 @@ findInitPid()
|
|||||||
fgets(buffer, 256, status);
|
fgets(buffer, 256, status);
|
||||||
fclose(status);
|
fclose(status);
|
||||||
|
|
||||||
if ( (strcmp(&buffer[6], "init\n") == 0)) {
|
if ( (strstr(buffer, "init\n") != NULL )) {
|
||||||
return init_pid;
|
return init_pid;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user