diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-12 20:34:01 +0100 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-12 20:34:01 +0100 |
commit | d2bda1cfddccdd4c553a15e775a037de3bbb0570 (patch) | |
tree | 965914462125326d3166287f4567ceae50bf7914 /target/linux/patches/3.12.13/startup.patch | |
parent | 22db207e5c13ad254ff488b8be2601792aae8586 (diff) | |
parent | d07bf77e221876d0c9d6f9813ef165265b67c15e (diff) |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'target/linux/patches/3.12.13/startup.patch')
-rw-r--r-- | target/linux/patches/3.12.13/startup.patch | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/target/linux/patches/3.12.13/startup.patch b/target/linux/patches/3.12.13/startup.patch index d23d6d212..4dccae8c1 100644 --- a/target/linux/patches/3.12.13/startup.patch +++ b/target/linux/patches/3.12.13/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"); |