From 2edf52643d3eb3d13f26d31f9678cf122f2063bc Mon Sep 17 00:00:00 2001 From: Rob Landley Date: Sun, 22 Jan 2006 02:41:51 +0000 Subject: 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.) --- init/init.c | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) (limited to 'init/init.c') 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 @@ * Copyright (C) 1999-2004 by Erik Andersen * 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 */ -- cgit v1.2.3