aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Denis Vlasenko <vda.linux@googlemail.com>2009-02-14 20:58:13 +0000
committerGravatar Denis Vlasenko <vda.linux@googlemail.com>2009-02-14 20:58:13 +0000
commit93b38208d1e7d759b3c8ed8e7eb91c10442033ff (patch)
tree01ee8fdde054d8d16d059aff461cb74de89fe842
parent97b954decbbdf55df3b867e238a8832a1104e3d4 (diff)
downloadbusybox-93b38208d1e7d759b3c8ed8e7eb91c10442033ff.tar.gz
busybox-93b38208d1e7d759b3c8ed8e7eb91c10442033ff.tar.bz2
init: fix compile breakage with '# CONFIG_FEATURE_KILL_REMOVED is not set'
runsvdir.c: fix typo in comment
-rw-r--r--init/init.c32
-rw-r--r--runit/runsvdir.c2
2 files changed, 17 insertions, 17 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)
* it to happen even somewhere inside "sysinit" would be a bit awkward.
*
* There is a tiny probability that SIGHUP and Ctrl-Alt-Del will collide
- * and only one will be remebered and acted upon.
+ * and only one will be remembered and acted upon.
*/
static void halt_reboot_pwoff(int sig) NORETURN;
@@ -782,23 +782,23 @@ static void reload_inittab(void)
*/
parse_inittab();
- if (ENABLE_FEATURE_KILL_REMOVED) {
- /* Kill stale entries */
- /* Be nice and send SIGTERM first */
- for (a = init_action_list; a; a = a->next)
- if (a->action_type == ONCE && a->pid != 0)
- kill(a->pid, SIGTERM);
- if (CONFIG_FEATURE_KILL_DELAY) {
- /* NB: parent will wait in NOMMU case */
- if ((BB_MMU ? fork() : vfork()) == 0) { /* child */
- sleep(CONFIG_FEATURE_KILL_DELAY);
- for (a = init_action_list; a; a = a->next)
- if (a->action_type == ONCE && a->pid != 0)
- kill(a->pid, SIGKILL);
- _exit(EXIT_SUCCESS);
- }
+#if ENABLE_FEATURE_KILL_REMOVED
+ /* Kill stale entries */
+ /* Be nice and send SIGTERM first */
+ for (a = init_action_list; a; a = a->next)
+ if (a->action_type == ONCE && a->pid != 0)
+ kill(a->pid, SIGTERM);
+ if (CONFIG_FEATURE_KILL_DELAY) {
+ /* NB: parent will wait in NOMMU case */
+ if ((BB_MMU ? fork() : vfork()) == 0) { /* child */
+ sleep(CONFIG_FEATURE_KILL_DELAY);
+ for (a = init_action_list; a; a = a->next)
+ if (a->action_type == ONCE && a->pid != 0)
+ kill(a->pid, SIGKILL);
+ _exit(EXIT_SUCCESS);
}
}
+#endif
/* Remove stale (ONCE) and not useful (SYSINIT,WAIT) entries */
nextp = &init_action_list;
diff --git a/runit/runsvdir.c b/runit/runsvdir.c
index f67330485..7b054e410 100644
--- a/runit/runsvdir.c
+++ b/runit/runsvdir.c
@@ -370,7 +370,7 @@ int runsvdir_main(int argc UNUSED_PARAM, char **argv)
opt_s_argv[1] = utoa(bb_got_signal);
pid = spawn(opt_s_argv);
if (pid > 0) {
- /* Remebering to wait for _any_ children,
+ /* Remembering to wait for _any_ children,
* not just pid */
while (wait(NULL) != pid)
continue;