X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/396dbf68b1cfdce2e6f455b5ec646b4c5b65c55e..65c272cf02a349ad6b272f2d0c49d55f7437b124:/package/busybox/patches/001-init_avoid_loop_opening_tty.patch

diff --git a/package/busybox/patches/001-init_avoid_loop_opening_tty.patch b/package/busybox/patches/001-init_avoid_loop_opening_tty.patch
index 25f690ab5..d6e000752 100644
--- a/package/busybox/patches/001-init_avoid_loop_opening_tty.patch
+++ b/package/busybox/patches/001-init_avoid_loop_opening_tty.patch
@@ -1,20 +1,15 @@
 --- a/init/init.c
 +++ b/init/init.c
-@@ -498,12 +498,11 @@ static void run_actions(int action_type)
- 	for (a = init_action_list; a; a = tmp) {
- 		tmp = a->next;
- 		if (a->action_type & action_type) {
--			// Pointless: run() will error out if open of device fails.
--			///* a->terminal of "" means "init's console" */
--			//if (a->terminal[0] && access(a->terminal, R_OK | W_OK)) {
--			//	//message(L_LOG | L_CONSOLE, "Device %s cannot be opened in RW mode", a->terminal /*, strerror(errno)*/);
--			//	delete_init_action(a);
--			//} else
-+			/* a->terminal of "" means "init's console" */
-+			if (a->terminal[0] && access(a->terminal, R_OK | W_OK)) {
-+				//message(L_LOG | L_CONSOLE, "Device %s cannot be opened in RW mode", a->terminal /*, strerror(errno)*/);
-+				delete_init_action(a);
-+			} else
- 			if (a->action_type & (SYSINIT | WAIT | CTRLALTDEL | SHUTDOWN | RESTART)) {
- 				waitfor(run(a));
- 				delete_init_action(a);
+@@ -460,8 +460,11 @@ static void run_actions(int action_type)
+ 			/* Only run stuff with pid == 0. If pid != 0,
+ 			 * it is already running
+ 			 */
+-			if (a->pid == 0)
++			if (a->pid == 0) {
++				if (a->terminal[0] && access(a->terminal, R_OK | W_OK))
++					continue;
+ 				a->pid = run(a);
++			}
+ 		}
+ 	}
+ }