summaryrefslogtreecommitdiff
path: root/target/linux
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-03-07 16:43:24 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2014-03-07 16:43:24 +0100
commit9e914d4c02c1835a714f10ce1ebd99dbe73877f6 (patch)
treea8e3ad35c2b0c5941bc1190f2da378f2258afd21 /target/linux
parent5101b72fac2c9a6971a0c7d2fe6bbd318e9678ab (diff)
use standard busybox init, remove previously used /init. some configs and ideas from buildroot project
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/patches/3.11.10/startup.patch10
-rw-r--r--target/linux/patches/3.12.13/startup.patch10
-rw-r--r--target/linux/patches/3.13.5/startup.patch10
-rw-r--r--target/linux/patches/3.4.82/startup.patch8
4 files changed, 0 insertions, 38 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");
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");
diff --git a/target/linux/patches/3.13.5/startup.patch b/target/linux/patches/3.13.5/startup.patch
index bfe3ae6ec..be4ea469d 100644
--- a/target/linux/patches/3.13.5/startup.patch
+++ b/target/linux/patches/3.13.5/startup.patch
@@ -1,16 +1,6 @@
diff -Nur linux-3.13.3.orig/init/main.c linux-3.13.3/init/main.c
--- linux-3.13.3.orig/init/main.c 2014-02-13 23:00:14.000000000 +0100
+++ linux-3.13.3/init/main.c 2014-02-17 11:35:14.000000000 +0100
-@@ -871,7 +871,8 @@
- pr_err("Failed to execute %s (error %d). Attempting defaults...\n",
- execute_command, ret);
- }
-- if (!try_to_run_init_process("/sbin/init") ||
-+ if (!try_to_run_init_process("/init") ||
-+ !try_to_run_init_process("/sbin/init") ||
- !try_to_run_init_process("/etc/init") ||
- !try_to_run_init_process("/bin/init") ||
- !try_to_run_init_process("/bin/sh"))
@@ -916,6 +917,8 @@
if (sys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0)
pr_err("Warning: unable to open an initial console.\n");
diff --git a/target/linux/patches/3.4.82/startup.patch b/target/linux/patches/3.4.82/startup.patch
index 68e8987b0..4f47eddcb 100644
--- a/target/linux/patches/3.4.82/startup.patch
+++ b/target/linux/patches/3.4.82/startup.patch
@@ -1,14 +1,6 @@
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");