diff options
Diffstat (limited to 'init')
| -rw-r--r-- | init/halt.c | 24 | ||||
| -rw-r--r-- | init/init.c | 17 | ||||
| -rw-r--r-- | init/init_shared.c | 31 | ||||
| -rw-r--r-- | init/poweroff.c | 32 | ||||
| -rw-r--r-- | init/reboot.c | 32 |
5 files changed, 9 insertions, 127 deletions
diff --git a/init/halt.c b/init/halt.c index bfc0042..89efdd6 100644 --- a/init/halt.c +++ b/init/halt.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,12 +24,5 @@ extern int halt_main(int argc, char **argv) sleep(atoi(delay)); } -#ifndef CONFIG_INIT -#ifndef RB_HALT_SYSTEM -#define RB_HALT_SYSTEM 0xcdef0123 -#endif - return(bb_shutdown_system(RB_HALT_SYSTEM)); -#else - return kill_init(SIGUSR1); -#endif + return ENABLE_INIT ? kill(1,SIGUSR1) : bb_shutdown_system(RB_HALT_SYSTEM); } diff --git a/init/init.c b/init/init.c index 96c7046..dcc8bd9 100644 --- a/init/init.c +++ b/init/init.c @@ -6,20 +6,7 @@ * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org> * Adjusted by so many folks, it's impossible to keep track. * - * 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. */ /* Turn this on to disable all the dangerous @@ -1033,7 +1020,7 @@ extern int init_main(int argc, char **argv) int status; if (argc > 1 && !strcmp(argv[1], "-q")) { - return kill_init(SIGHUP); + return kill(1,SIGHUP); } #ifndef DEBUG_INIT /* 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 0ad55a4..7e3cc10 100644 --- a/init/init_shared.c +++ b/init/init_shared.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> @@ -29,22 +16,6 @@ #include "busybox.h" #include "init_shared.h" -extern int kill_init(int sig) -{ -#ifdef CONFIG_FEATURE_INITRD - /* don't assume init's pid == 1 */ - long *pid = find_pid_by_name("init"); - if (!pid || *pid<=0) { - pid = find_pid_by_name("linuxrc"); - if (!pid || *pid<=0) - bb_error_msg_and_die("no process killed"); - } - return(kill(*pid, sig)); -#else - return(kill(1, sig)); -#endif -} - #ifndef CONFIG_INIT const char * const bb_shutdown_format = "\r%s\n"; extern int bb_shutdown_system(unsigned long magic) diff --git a/init/poweroff.c b/init/poweroff.c index 8169508..b79bcd0 100644 --- a/init/poweroff.c +++ b/init/poweroff.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 poweroff_main(int argc, char **argv) sleep(atoi(delay)); } -#ifndef CONFIG_INIT -#ifndef RB_POWER_OFF -#define RB_POWER_OFF 0x4321fedc -#endif - return(bb_shutdown_system(RB_POWER_OFF)); -#else - return kill_init(SIGUSR2); -#endif + return ENABLE_INIT ? kill(1,SIGUSR2) : bb_shutdown_system(RB_POWER_OFF); } - -/* -Local Variables: -c-file-style: "linux" -c-basic-offset: 4 -tab-width: 4 -End: -*/ 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: -*/ |