aboutsummaryrefslogtreecommitdiff
path: root/init/init.c
diff options
context:
space:
mode:
authorRob Landley <rob@landley.net>2006-01-22 02:41:51 +0000
committerRob Landley <rob@landley.net>2006-01-22 02:41:51 +0000
commit2edf52643d3eb3d13f26d31f9678cf122f2063bc (patch)
treeb249213d497c63855110294a5ce31ad614027737 /init/init.c
parentaaffef4d338f6f3d554eb0428e572ebbd5e00476 (diff)
downloadbusybox-w32-2edf52643d3eb3d13f26d31f9678cf122f2063bc.tar.gz
busybox-w32-2edf52643d3eb3d13f26d31f9678cf122f2063bc.tar.bz2
busybox-w32-2edf52643d3eb3d13f26d31f9678cf122f2063bc.zip
The whole "init is sometimes pid 3" thing is silly. Init is pid 1, anything
else is a kernel bug. Both 2.4 and 2.6 should get this right now. This should fix the bug IraquiGeek is seeing (although killall still needs to be fixed.)
Diffstat (limited to 'init/init.c')
-rw-r--r--init/init.c17
1 files changed, 2 insertions, 15 deletions
diff --git a/init/init.c b/init/init.c
index 96c704670..dcc8bd9ce 100644
--- a/init/init.c
+++ b/init/init.c
@@ -6,20 +6,7 @@
6 * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org> 6 * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
7 * Adjusted by so many folks, it's impossible to keep track. 7 * Adjusted by so many folks, it's impossible to keep track.
8 * 8 *
9 * This program is free software; you can redistribute it and/or modify 9 * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
10 * it under the terms of the GNU General Public License as published by
11 * the Free Software Foundation; either version 2 of the License, or
12 * (at your option) any later version.
13 *
14 * This program is distributed in the hope that it will be useful,
15 * but WITHOUT ANY WARRANTY; without even the implied warranty of
16 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
17 * General Public License for more details.
18 *
19 * You should have received a copy of the GNU General Public License
20 * along with this program; if not, write to the Free Software
21 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
22 *
23 */ 10 */
24 11
25/* Turn this on to disable all the dangerous 12/* Turn this on to disable all the dangerous
@@ -1033,7 +1020,7 @@ extern int init_main(int argc, char **argv)
1033 int status; 1020 int status;
1034 1021
1035 if (argc > 1 && !strcmp(argv[1], "-q")) { 1022 if (argc > 1 && !strcmp(argv[1], "-q")) {
1036 return kill_init(SIGHUP); 1023 return kill(1,SIGHUP);
1037 } 1024 }
1038#ifndef DEBUG_INIT 1025#ifndef DEBUG_INIT
1039 /* Expect to be invoked as init with PID=1 or be invoked as linuxrc */ 1026 /* Expect to be invoked as init with PID=1 or be invoked as linuxrc */