svn commit: trunk/busybox: init runit

[vda at busybox.net]

Author: vda
Date: 2009-02-14 20:58:13 +0000 (Sat, 14 Feb 2009)
New Revision: 25336

Log:
init: fix compile breakage with '# CONFIG_FEATURE_KILL_REMOVED is not set'
runsvdir.c: fix typo in comment



Modified:
   trunk/busybox/init/init.c
   trunk/busybox/runit/runsvdir.c


Changeset:
Modified: trunk/busybox/init/init.c
===================================================================
--- trunk/busybox/init/init.c	2009-02-14 13:17:48 UTC (rev 25335)
+++ trunk/busybox/init/init.c	2009-02-14 20:58:13 UTC (rev 25336)
@@ -668,7 +668,7 @@
  * 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 @@
 	 */
 	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;

Modified: trunk/busybox/runit/runsvdir.c
===================================================================
--- trunk/busybox/runit/runsvdir.c	2009-02-14 13:17:48 UTC (rev 25335)
+++ trunk/busybox/runit/runsvdir.c	2009-02-14 20:58:13 UTC (rev 25336)
@@ -370,7 +370,7 @@
 			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;