[package] nvram: handle nvram at varying offsets within the eraseblock (fixes Edimax...

[openwrt.git] / 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 8cc9ca2..6cf410d 100644 (file)
--- a/package/busybox/patches/001-init_avoid_loop_opening_tty.patch
+++ b/package/busybox/patches/001-init_avoid_loop_opening_tty.patch
@@ -1,12 +1,12 @@
 --- a/init/init.c
 +++ b/init/init.c
 --- a/init/init.c
 +++ b/init/init.c

-@@ -451,8 +451,11 @@ static void run_actions(int action_type)
+@@ -456,8 +456,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) {
                        /* Only run stuff with pid == 0. If pid != 0,
                         * it is already running
                         */
 -                      if (a->pid == 0)
 +                      if (a->pid == 0) {

-+                              if (a->terminal && access(a->terminal, R_OK | W_OK))
++                              if (a->terminal[0] && access(a->terminal, R_OK | W_OK))

 +                                      continue;
                                a->pid = run(a);
 +                      }
 +                                      continue;
                                a->pid = run(a);
 +                      }