aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Crispin <john@openwrt.org>2013-04-03 10:00:50 +0000
committerJohn Crispin <john@openwrt.org>2013-04-03 10:00:50 +0000
commitc838ec2391117e898bb2f86a99edbb6a30de653b (patch)
treeaecf7ae52fe11ffff904a4e11b3a548cf569e263
parent219313833a7249112d9d604afc703e2ef7a6daac (diff)
downloadupstream-c838ec2391117e898bb2f86a99edbb6a30de653b.tar.gz
upstream-c838ec2391117e898bb2f86a99edbb6a30de653b.tar.bz2
upstream-c838ec2391117e898bb2f86a99edbb6a30de653b.zip
Patch for invoking (pre)init
http://patchwork.openwrt.org/patch/3485/ Signed-off-by: Michael Heimpold <mhei@heimpold.de> SVN-Revision: 36183
-rw-r--r--target/linux/generic/patches-3.8/921-use_preinit_as_init.patch20
-rw-r--r--target/linux/generic/patches-3.9/921-use_preinit_as_init.patch20
2 files changed, 20 insertions, 20 deletions
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 4cc3695684..482e2525df 100644
--- 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,14 @@
---- 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"))
diff --git a/target/linux/generic/patches-3.9/921-use_preinit_as_init.patch b/target/linux/generic/patches-3.9/921-use_preinit_as_init.patch
index 6004a7009d..482e2525df 100644
--- a/target/linux/generic/patches-3.9/921-use_preinit_as_init.patch
+++ b/target/linux/generic/patches-3.9/921-use_preinit_as_init.patch
@@ -1,14 +1,14 @@
---- 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"))