From b01ed65ad2e46fc7747010b16e53b3a9e1a7c23a Mon Sep 17 00:00:00 2001 From: Eric Andersen Date: Fri, 27 Jun 2003 17:08:15 +0000 Subject: Apply last_patch93 from vodz: andersen@busybox.net wrote: >Message: 4 >Modified Files: > init.c >Log Message: >Remove code for unsupported kernel versions Hmm. Current init.c have check >= 2.2.0 kernel one time too. Ok. Last patch removed this point and move common init code to new file for /init dir --- init/halt.c | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) (limited to 'init/halt.c') diff --git a/init/halt.c b/init/halt.c index 7e663227c..b9eeaebdd 100644 --- a/init/halt.c +++ b/init/halt.c @@ -23,19 +23,10 @@ #include "busybox.h" #include +#include "init_shared.h" + extern int halt_main(int argc, char **argv) { -#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, SIGUSR1)); -#else - return(kill(1, SIGUSR1)); -#endif + return kill_init(SIGUSR1); } -- cgit v1.2.3