diff options
| author | Denis Vlasenko <vda.linux@googlemail.com> | 2009-02-14 20:58:13 +0000 |
|---|---|---|
| committer | Denis Vlasenko <vda.linux@googlemail.com> | 2009-02-14 20:58:13 +0000 |
| commit | 93b38208d1e7d759b3c8ed8e7eb91c10442033ff (patch) | |
| tree | 01ee8fdde054d8d16d059aff461cb74de89fe842 /init | |
| parent | 97b954decbbdf55df3b867e238a8832a1104e3d4 (diff) | |
| download | busybox-w32-93b38208d1e7d759b3c8ed8e7eb91c10442033ff.tar.gz busybox-w32-93b38208d1e7d759b3c8ed8e7eb91c10442033ff.tar.bz2 busybox-w32-93b38208d1e7d759b3c8ed8e7eb91c10442033ff.zip | |
init: fix compile breakage with '# CONFIG_FEATURE_KILL_REMOVED is not set'
runsvdir.c: fix typo in comment
Diffstat (limited to 'init')
| -rw-r--r-- | init/init.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/init/init.c b/init/init.c index 68e624294..5b9820b4a 100644 --- a/init/init.c +++ b/init/init.c | |||
| @@ -668,7 +668,7 @@ static void run_shutdown_and_kill_processes(void) | |||
| 668 | * it to happen even somewhere inside "sysinit" would be a bit awkward. | 668 | * it to happen even somewhere inside "sysinit" would be a bit awkward. |
| 669 | * | 669 | * |
| 670 | * There is a tiny probability that SIGHUP and Ctrl-Alt-Del will collide | 670 | * There is a tiny probability that SIGHUP and Ctrl-Alt-Del will collide |
| 671 | * and only one will be remebered and acted upon. | 671 | * and only one will be remembered and acted upon. |
| 672 | */ | 672 | */ |
| 673 | 673 | ||
| 674 | static void halt_reboot_pwoff(int sig) NORETURN; | 674 | static void halt_reboot_pwoff(int sig) NORETURN; |
| @@ -782,23 +782,23 @@ static void reload_inittab(void) | |||
| 782 | */ | 782 | */ |
| 783 | parse_inittab(); | 783 | parse_inittab(); |
| 784 | 784 | ||
| 785 | if (ENABLE_FEATURE_KILL_REMOVED) { | 785 | #if ENABLE_FEATURE_KILL_REMOVED |
| 786 | /* Kill stale entries */ | 786 | /* Kill stale entries */ |
| 787 | /* Be nice and send SIGTERM first */ | 787 | /* Be nice and send SIGTERM first */ |
| 788 | for (a = init_action_list; a; a = a->next) | 788 | for (a = init_action_list; a; a = a->next) |
| 789 | if (a->action_type == ONCE && a->pid != 0) | 789 | if (a->action_type == ONCE && a->pid != 0) |
| 790 | kill(a->pid, SIGTERM); | 790 | kill(a->pid, SIGTERM); |
| 791 | if (CONFIG_FEATURE_KILL_DELAY) { | 791 | if (CONFIG_FEATURE_KILL_DELAY) { |
| 792 | /* NB: parent will wait in NOMMU case */ | 792 | /* NB: parent will wait in NOMMU case */ |
| 793 | if ((BB_MMU ? fork() : vfork()) == 0) { /* child */ | 793 | if ((BB_MMU ? fork() : vfork()) == 0) { /* child */ |
| 794 | sleep(CONFIG_FEATURE_KILL_DELAY); | 794 | sleep(CONFIG_FEATURE_KILL_DELAY); |
| 795 | for (a = init_action_list; a; a = a->next) | 795 | for (a = init_action_list; a; a = a->next) |
| 796 | if (a->action_type == ONCE && a->pid != 0) | 796 | if (a->action_type == ONCE && a->pid != 0) |
| 797 | kill(a->pid, SIGKILL); | 797 | kill(a->pid, SIGKILL); |
| 798 | _exit(EXIT_SUCCESS); | 798 | _exit(EXIT_SUCCESS); |
| 799 | } | ||
| 800 | } | 799 | } |
| 801 | } | 800 | } |
| 801 | #endif | ||
| 802 | 802 | ||
| 803 | /* Remove stale (ONCE) and not useful (SYSINIT,WAIT) entries */ | 803 | /* Remove stale (ONCE) and not useful (SYSINIT,WAIT) entries */ |
| 804 | nextp = &init_action_list; | 804 | nextp = &init_action_list; |