init: fix compile breakage with '# CONFIG_FEATURE_KILL_REMOVED is not set'
authorDenis Vlasenko <vda.linux@googlemail.com>
Sat, 14 Feb 2009 20:58:13 +0000 (20:58 -0000)
committerDenis Vlasenko <vda.linux@googlemail.com>
Sat, 14 Feb 2009 20:58:13 +0000 (20:58 -0000)
runsvdir.c: fix typo in comment

init/init.c
runit/runsvdir.c

index 68e6242944ee8764197f2381e2fb7ed3dc0f77fc..5b9820b4a05a2cdc5c9a1d68c9cae4d8031d6573 100644 (file)
@@ -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;
index f6733048547ef7751909220b40b431f0f2ac07a4..7b054e410ebfe57225d3b0894ba48b00cd8d5d74 100644 (file)
@@ -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;