summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorDenis Vlasenko <vda.linux@googlemail.com>2008-08-03 18:43:45 +0000
committerDenis Vlasenko <vda.linux@googlemail.com>2008-08-03 18:43:45 +0000
commit1e28f6171fe9cb56422473d506aa28fdb1eb46d8 (patch)
treeedf9401b4fa49a9b75f3d6c1141b23254b9842e2
parentcfe2936a73a286aee8f8b0336212e996ad4d9f95 (diff)
halt: signal init regardless of ENABLE_INIT
-rw-r--r--init/halt.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/init/halt.c b/init/halt.c
index 7e1b30f39..8c1f30b08 100644
--- a/init/halt.c
+++ b/init/halt.c
@@ -34,7 +34,7 @@ RB_AUTOBOOT
static const smallint signals[] = { SIGUSR1, SIGUSR2, SIGTERM };
int delay = 0;
- int which, flags, rc = 1;
+ int which, flags, rc;
#if ENABLE_FEATURE_WTMP
struct utmp utmp;
struct utsname uts;
@@ -71,7 +71,10 @@ RB_AUTOBOOT
sync();
/* Perform action. */
- if (ENABLE_INIT && !(flags & 4)) { /* no -f */
+ rc = 1;
+ if (!(flags & 4)) { /* no -f */
+//TODO: I tend to think that signalling linuxrc is wrong
+// pity original author didn't comment on it...
if (ENABLE_FEATURE_INITRD) {
pid_t *pidlist = find_pid_by_name("linuxrc");
if (pidlist[0] > 0)