diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2013-10-21 17:22:31 +0200 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2013-10-21 17:22:31 +0200 |
commit | 32a82e38679501da738199135b35f93ddc8aca0a (patch) | |
tree | ed280e079a8bab790b3dba5f62f1d300ada7540b /target/linux/patches/3.4.65/startup.patch | |
parent | 90d5c8b73e8d538e121275b12e714332ca785cff (diff) | |
parent | 86c05906d3e804b41b9280c226a3a07f6fad5f27 (diff) |
resolve conflicts
Diffstat (limited to 'target/linux/patches/3.4.65/startup.patch')
-rw-r--r-- | target/linux/patches/3.4.65/startup.patch | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/target/linux/patches/3.4.65/startup.patch b/target/linux/patches/3.4.65/startup.patch new file mode 100644 index 000000000..68e8987b0 --- /dev/null +++ b/target/linux/patches/3.4.65/startup.patch @@ -0,0 +1,20 @@ +diff -Nur linux-2.6.34.orig/init/main.c linux-2.6.34/init/main.c +--- linux-2.6.34.orig/init/main.c 2010-05-16 23:17:36.000000000 +0200 ++++ linux-2.6.34/init/main.c 2010-05-20 20:13:26.321613615 +0200 +@@ -842,6 +842,7 @@ + printk(KERN_WARNING "Failed to execute %s. Attempting " + "defaults...\n", execute_command); + } ++ run_init_process("/init"); + run_init_process("/sbin/init"); + run_init_process("/etc/init"); + run_init_process("/bin/init"); +@@ -889,6 +890,8 @@ + if (sys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0) + printk(KERN_WARNING "Warning: unable to open an initial console.\n"); + ++ printk(KERN_WARNING "Starting Linux (built with OpenADK).\n"); ++ + (void) sys_dup(0); + (void) sys_dup(0); + /* |