summaryrefslogtreecommitdiff
path: root/target/linux/patches/3.11.10/startup.patch
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-03-13 09:11:48 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2014-03-13 09:11:48 +0100
commit607c3fcd1d10a37c077c870df450b5389fb519bf (patch)
tree9c7c0e209d6373efe2296e379c63c29d27a8847b /target/linux/patches/3.11.10/startup.patch
parentc16eb800d935d903d2ab38b3da8270324284e973 (diff)
parentf42fb988bae9d402b0b204614b54ba9b4261d877 (diff)
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'target/linux/patches/3.11.10/startup.patch')
-rw-r--r--target/linux/patches/3.11.10/startup.patch10
1 files changed, 0 insertions, 10 deletions
diff --git a/target/linux/patches/3.11.10/startup.patch b/target/linux/patches/3.11.10/startup.patch
index d23d6d212..4dccae8c1 100644
--- a/target/linux/patches/3.11.10/startup.patch
+++ b/target/linux/patches/3.11.10/startup.patch
@@ -1,16 +1,6 @@
diff -Nur linux-3.7.3.orig/init/main.c linux-3.7.3/init/main.c
--- linux-3.7.3.orig/init/main.c 2013-01-17 17:47:40.000000000 +0100
+++ linux-3.7.3/init/main.c 2013-01-19 15:08:13.000000000 +0100
-@@ -834,7 +834,8 @@
- printk(KERN_WARNING "Failed to execute %s. Attempting "
- "defaults...\n", execute_command);
- }
-- if (!run_init_process("/sbin/init") ||
-+ if (!run_init_process("/init") ||
-+ !run_init_process("/sbin/init") ||
- !run_init_process("/etc/init") ||
- !run_init_process("/bin/init") ||
- !run_init_process("/bin/sh"))
@@ -879,6 +880,8 @@
if (sys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0)
printk(KERN_WARNING "Warning: unable to open an initial console.\n");