Changeset 36183

Timestamp:

2013-04-03T12:00:50+02:00 (5 years ago)

Author:

blogic

Message:

[kernel] Patch for invoking (pre)init

​http://patchwork.openwrt.org/patch/3485/

Signed-off-by: Michael Heimpold <mhei@…>

Location:

trunk/target/linux/generic

Files:

• patches-3.8/921-use_preinit_as_init.patch (modified) (1 diff)
• patches-3.9/921-use_preinit_as_init.patch (modified) (1 diff)

trunk/target/linux/generic/patches-3.8/921-use_preinit_as_init.patch

@@ -1 @@
---- a/init/main.c
-+++ b/init/main.c
-@@ -835,10 +835,7 @@ static int __ref kernel_init(void *unuse
+Index: linux-3.8.3/init/main.c
+===================================================================
+--- linux-3.8.3.orig/init/main.c        2013-04-02 21:43:30.000000000 +0200
++++ linux-3.8.3/init/main.c     2013-04-02 21:44:26.362130897 +0200
+@@ -835,7 +835,8 @@
                 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"))

trunk/target/linux/generic/patches-3.9/921-use_preinit_as_init.patch

@@ -1 @@
---- a/init/main.c
-+++ b/init/main.c
-@@ -848,10 +848,7 @@ static int __ref kernel_init(void *unuse
+Index: linux-3.8.3/init/main.c
+===================================================================
+--- linux-3.8.3.orig/init/main.c        2013-04-02 21:43:30.000000000 +0200
++++ linux-3.8.3/init/main.c     2013-04-02 21:44:26.362130897 +0200
+@@ -835,7 +835,8 @@
                 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"))