diff options
| author | Rob Landley | 2006-01-22 02:41:51 +0000 |
|---|---|---|
| committer | Rob Landley | 2006-01-22 02:41:51 +0000 |
| commit | 2edf52643d3eb3d13f26d31f9678cf122f2063bc (patch) | |
| tree | b249213d497c63855110294a5ce31ad614027737 /init/reboot.c | |
| parent | aaffef4d338f6f3d554eb0428e572ebbd5e00476 (diff) | |
| download | busybox-2edf52643d3eb3d13f26d31f9678cf122f2063bc.zip busybox-2edf52643d3eb3d13f26d31f9678cf122f2063bc.tar.gz | |
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/reboot.c')
| -rw-r--r-- | init/reboot.c | 32 |
1 files changed, 2 insertions, 30 deletions
diff --git a/init/reboot.c b/init/reboot.c index ca4e9a2..5508f0b 100644 --- a/init/reboot.c +++ b/init/reboot.c @@ -4,20 +4,7 @@ * * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org> * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * + * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. */ #include <signal.h> @@ -37,20 +24,5 @@ extern int reboot_main(int argc, char **argv) sleep(atoi(delay)); } -#ifndef CONFIG_INIT -#ifndef RB_AUTOBOOT -#define RB_AUTOBOOT 0x01234567 -#endif - return(bb_shutdown_system(RB_AUTOBOOT)); -#else - return kill_init(SIGTERM); -#endif + return ENABLE_INIT ? kill(1,SIGTERM) : bb_shutdown_system(RB_AUTOBOOT); } - -/* -Local Variables: -c-file-style: "linux" -c-basic-offset: 4 -tab-width: 4 -End: -*/ |