kernel: remove the netfilter optimization that skips the filter table, it has caused...

[openwrt/svn-archive/archive.git] / target / linux / generic / patches-3.8 / 921-use_preinit_as_init.patch

diff --git a/target/linux/generic/patches-3.8/921-use_preinit_as_init.patch b/target/linux/generic/patches-3.8/921-use_preinit_as_init.patch
index 4cc3695684ed8a369761a62a246b1e7b55686d43..ef3b9c2a0759c1667e63561cae583c714408eb36 100644 (file)
--- a/target/linux/generic/patches-3.8/921-use_preinit_as_init.patch
+++ b/target/linux/generic/patches-3.8/921-use_preinit_as_init.patch
@@ -1,14 +1,12 @@
 --- a/init/main.c
 +++ b/init/main.c
-@@ -835,10 +835,7 @@ static int __ref kernel_init(void *unuse
+@@ -835,7 +835,8 @@ static int __ref kernel_init(void *unuse
                printk(KERN_WARNING "Failed to execute %s.  Attempting "
                                        "defaults...\n", execute_command);
        }
 -      if (!run_init_process("/sbin/init") ||
--          !run_init_process("/etc/init") ||
--          !run_init_process("/bin/init") ||
--          !run_init_process("/bin/sh"))
-+      if (!run_init_process("/etc/preinit"))
-               return 0;
- 
-       panic("No init found.  Try passing init= option to kernel. "
++      if (!run_init_process("/etc/preinit") ||
++          !run_init_process("/sbin/init") ||
+           !run_init_process("/etc/init") ||
+           !run_init_process("/bin/init") ||
+           !run_init_process("/bin/sh"))