aboutsummaryrefslogtreecommitdiffstats
path: root/package/busybox/patches/001-init_avoid_loop_opening_tty.patch
diff options
context:
space:
mode:
authorImre Kaloz <kaloz@openwrt.org>2008-08-20 14:00:34 +0000
committerImre Kaloz <kaloz@openwrt.org>2008-08-20 14:00:34 +0000
commit088d86511f9e407a27a62e16af60ced1fb05944f (patch)
treee2bbc127a4a059392f3c5bea27e2944e0c149ecb /package/busybox/patches/001-init_avoid_loop_opening_tty.patch
parent57db10667068d52282c008a820e50d930c99d3fa (diff)
downloadupstream-088d86511f9e407a27a62e16af60ced1fb05944f.tar.gz
upstream-088d86511f9e407a27a62e16af60ced1fb05944f.tar.bz2
upstream-088d86511f9e407a27a62e16af60ced1fb05944f.zip
upgrade busybox to v1.11.1 and add current upstream fixes
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@12348 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/busybox/patches/001-init_avoid_loop_opening_tty.patch')
-rw-r--r--package/busybox/patches/001-init_avoid_loop_opening_tty.patch20
1 files changed, 20 insertions, 0 deletions
diff --git a/package/busybox/patches/001-init_avoid_loop_opening_tty.patch b/package/busybox/patches/001-init_avoid_loop_opening_tty.patch
new file mode 100644
index 0000000000..7027230552
--- /dev/null
+++ b/package/busybox/patches/001-init_avoid_loop_opening_tty.patch
@@ -0,0 +1,20 @@
+--- a/init/init.c
++++ b/init/init.c
+@@ -505,12 +505,11 @@
+ for (a = init_action_list; a; a = tmp) {
+ tmp = a->next;
+ if (a->action_type & action_type) {
+- // Pointless: run() will error out if open of device fails.
+- ///* a->terminal of "" means "init's console" */
+- //if (a->terminal[0] && access(a->terminal, R_OK | W_OK)) {
+- // //message(L_LOG | L_CONSOLE, "Device %s cannot be opened in RW mode", a->terminal /*, strerror(errno)*/);
+- // delete_init_action(a);
+- //} else
++ /* a->terminal of "" means "init's console" */
++ if (a->terminal[0] && access(a->terminal, R_OK | W_OK)) {
++ //message(L_LOG | L_CONSOLE, "Device %s cannot be opened in RW mode", a->terminal /*, strerror(errno)*/);
++ delete_init_action(a);
++ } else
+ if (a->action_type & (SYSINIT | WAIT | CTRLALTDEL | SHUTDOWN | RESTART)) {
+ waitfor(run(a));
+ delete_init_action(a);