summaryrefslogtreecommitdiff
path: root/init
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
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')
-rw-r--r--init/halt.c24
-rw-r--r--init/init.c17
-rw-r--r--init/init_shared.c31
-rw-r--r--init/poweroff.c32
-rw-r--r--init/reboot.c32
5 files changed, 9 insertions, 127 deletions
diff --git a/init/halt.c b/init/halt.c
index bfc0042fa..89efdd64a 100644
--- a/init/halt.c
+++ b/init/halt.c
@@ -4,20 +4,7 @@
4 * 4 *
5 * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org> 5 * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
6 * 6 *
7 * This program is free software; you can redistribute it and/or modify 7 * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
8 * it under the terms of the GNU General Public License as published by
9 * the Free Software Foundation; either version 2 of the License, or
10 * (at your option) any later version.
11 *
12 * This program is distributed in the hope that it will be useful,
13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
15 * General Public License for more details.
16 *
17 * You should have received a copy of the GNU General Public License
18 * along with this program; if not, write to the Free Software
19 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
20 *
21 */ 8 */
22 9
23#include <signal.h> 10#include <signal.h>
@@ -37,12 +24,5 @@ extern int halt_main(int argc, char **argv)
37 sleep(atoi(delay)); 24 sleep(atoi(delay));
38 } 25 }
39 26
40#ifndef CONFIG_INIT 27 return ENABLE_INIT ? kill(1,SIGUSR1) : bb_shutdown_system(RB_HALT_SYSTEM);
41#ifndef RB_HALT_SYSTEM
42#define RB_HALT_SYSTEM 0xcdef0123
43#endif
44 return(bb_shutdown_system(RB_HALT_SYSTEM));
45#else
46 return kill_init(SIGUSR1);
47#endif
48} 28}
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 */
diff --git a/init/init_shared.c b/init/init_shared.c
index 0ad55a433..7e3cc100d 100644
--- a/init/init_shared.c
+++ b/init/init_shared.c
@@ -4,20 +4,7 @@
4 * 4 *
5 * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org> 5 * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
6 * 6 *
7 * This program is free software; you can redistribute it and/or modify 7 * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
8 * it under the terms of the GNU General Public License as published by
9 * the Free Software Foundation; either version 2 of the License, or
10 * (at your option) any later version.
11 *
12 * This program is distributed in the hope that it will be useful,
13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
15 * General Public License for more details.
16 *
17 * You should have received a copy of the GNU General Public License
18 * along with this program; if not, write to the Free Software
19 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
20 *
21 */ 8 */
22 9
23#include <signal.h> 10#include <signal.h>
@@ -29,22 +16,6 @@
29#include "busybox.h" 16#include "busybox.h"
30#include "init_shared.h" 17#include "init_shared.h"
31 18
32extern int kill_init(int sig)
33{
34#ifdef CONFIG_FEATURE_INITRD
35 /* don't assume init's pid == 1 */
36 long *pid = find_pid_by_name("init");
37 if (!pid || *pid<=0) {
38 pid = find_pid_by_name("linuxrc");
39 if (!pid || *pid<=0)
40 bb_error_msg_and_die("no process killed");
41 }
42 return(kill(*pid, sig));
43#else
44 return(kill(1, sig));
45#endif
46}
47
48#ifndef CONFIG_INIT 19#ifndef CONFIG_INIT
49const char * const bb_shutdown_format = "\r%s\n"; 20const char * const bb_shutdown_format = "\r%s\n";
50extern int bb_shutdown_system(unsigned long magic) 21extern int bb_shutdown_system(unsigned long magic)
diff --git a/init/poweroff.c b/init/poweroff.c
index 81695087d..b79bcd036 100644
--- a/init/poweroff.c
+++ b/init/poweroff.c
@@ -4,20 +4,7 @@
4 * 4 *
5 * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org> 5 * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
6 * 6 *
7 * This program is free software; you can redistribute it and/or modify 7 * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
8 * it under the terms of the GNU General Public License as published by
9 * the Free Software Foundation; either version 2 of the License, or
10 * (at your option) any later version.
11 *
12 * This program is distributed in the hope that it will be useful,
13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
15 * General Public License for more details.
16 *
17 * You should have received a copy of the GNU General Public License
18 * along with this program; if not, write to the Free Software
19 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
20 *
21 */ 8 */
22 9
23#include <signal.h> 10#include <signal.h>
@@ -37,20 +24,5 @@ extern int poweroff_main(int argc, char **argv)
37 sleep(atoi(delay)); 24 sleep(atoi(delay));
38 } 25 }
39 26
40#ifndef CONFIG_INIT 27 return ENABLE_INIT ? kill(1,SIGUSR2) : bb_shutdown_system(RB_POWER_OFF);
41#ifndef RB_POWER_OFF
42#define RB_POWER_OFF 0x4321fedc
43#endif
44 return(bb_shutdown_system(RB_POWER_OFF));
45#else
46 return kill_init(SIGUSR2);
47#endif
48} 28}
49
50/*
51Local Variables:
52c-file-style: "linux"
53c-basic-offset: 4
54tab-width: 4
55End:
56*/
diff --git a/init/reboot.c b/init/reboot.c
index ca4e9a240..5508f0be9 100644
--- a/init/reboot.c
+++ b/init/reboot.c
@@ -4,20 +4,7 @@
4 * 4 *
5 * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org> 5 * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
6 * 6 *
7 * This program is free software; you can redistribute it and/or modify 7 * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
8 * it under the terms of the GNU General Public License as published by
9 * the Free Software Foundation; either version 2 of the License, or
10 * (at your option) any later version.
11 *
12 * This program is distributed in the hope that it will be useful,
13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
15 * General Public License for more details.
16 *
17 * You should have received a copy of the GNU General Public License
18 * along with this program; if not, write to the Free Software
19 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
20 *
21 */ 8 */
22 9
23#include <signal.h> 10#include <signal.h>
@@ -37,20 +24,5 @@ extern int reboot_main(int argc, char **argv)
37 sleep(atoi(delay)); 24 sleep(atoi(delay));
38 } 25 }
39 26
40#ifndef CONFIG_INIT 27 return ENABLE_INIT ? kill(1,SIGTERM) : bb_shutdown_system(RB_AUTOBOOT);
41#ifndef RB_AUTOBOOT
42#define RB_AUTOBOOT 0x01234567
43#endif
44 return(bb_shutdown_system(RB_AUTOBOOT));
45#else
46 return kill_init(SIGTERM);
47#endif
48} 28}
49
50/*
51Local Variables:
52c-file-style: "linux"
53c-basic-offset: 4
54tab-width: 4
55End:
56*/
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-17 00:29:59 +0000