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.)

1 files changed, 1 insertions, 30 deletions

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 @@
  *
  * 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)