summaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorblogic <blogic@3c298f89-4303-0410-b956-a3cf2f4a3e73>2013-04-03 10:00:50 +0000
committerblogic <blogic@3c298f89-4303-0410-b956-a3cf2f4a3e73>2013-04-03 10:00:50 +0000
commit8b542413c96cc9884ef3933a35400bdd36446ab8 (patch)
treed9587c25aa226e2fe4bcfba3356760d2b888b9f7 /target/linux
parenteb628a641c8dbcb7857e6aa18b95f7e17267f39b (diff)
[kernel] Patch for invoking (pre)init
http://patchwork.openwrt.org/patch/3485/ Signed-off-by: Michael Heimpold <mhei@heimpold.de> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36183 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux')
-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 4cc369568..482e2525d 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 6004a7009..482e2525d 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"))