aboutsummaryrefslogtreecommitdiffstats
path: root/main/busybox/0010-udhcpc-Don-t-background-if-n-is-given.patch
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2017-07-06 15:39:38 +0200
committerNatanael Copa <ncopa@alpinelinux.org>2017-07-06 17:01:04 +0200
commit90b8dec39f98e83648301f1ad5dcd06597afb3ac (patch)
tree1c251ef1b2e7200e6199acc31006fcc37b6ae16b /main/busybox/0010-udhcpc-Don-t-background-if-n-is-given.patch
parent8d37b00520d39566c515e8040616ac1ad9614bf7 (diff)
downloadaports-90b8dec39f98e83648301f1ad5dcd06597afb3ac.tar.gz
aports-90b8dec39f98e83648301f1ad5dcd06597afb3ac.tar.bz2
aports-90b8dec39f98e83648301f1ad5dcd06597afb3ac.tar.xz
main/busybox: 1.27.0
Diffstat (limited to 'main/busybox/0010-udhcpc-Don-t-background-if-n-is-given.patch')
-rw-r--r--main/busybox/0010-udhcpc-Don-t-background-if-n-is-given.patch45
1 files changed, 45 insertions, 0 deletions
diff --git a/main/busybox/0010-udhcpc-Don-t-background-if-n-is-given.patch b/main/busybox/0010-udhcpc-Don-t-background-if-n-is-given.patch
new file mode 100644
index 0000000000..75fe62dfd7
--- /dev/null
+++ b/main/busybox/0010-udhcpc-Don-t-background-if-n-is-given.patch
@@ -0,0 +1,45 @@
+From a663349a9ae6d62bfad1243a8781fb254065b480 Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Thu, 6 Jul 2017 13:39:15 +0200
+Subject: [PATCH 10/11] udhcpc: Don't background if -n is given
+
+we need add -b to our udhcpc options to prevent boot forever if there are no
+dhcp server. We also need a way for users to disable this behavior by making
+it possible to set -n option at runtime.
+---
+ networking/udhcp/dhcpc.c | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/networking/udhcp/dhcpc.c b/networking/udhcp/dhcpc.c
+index 43aac1b85..bf53dd559 100644
+--- a/networking/udhcp/dhcpc.c
++++ b/networking/udhcp/dhcpc.c
+@@ -1504,19 +1504,19 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv)
+ }
+ leasefail:
+ udhcp_run_script(NULL, "leasefail");
++ if (opt & OPT_n) { /* abort if no lease */
++ bb_error_msg("no lease, failing");
++ retval = 1;
++ goto ret;
++ }
+ #if BB_MMU /* -b is not supported on NOMMU */
+ if (opt & OPT_b) { /* background if no lease */
+ bb_error_msg("no lease, forking to background");
+ client_background();
+ /* do not background again! */
+ opt = ((opt & ~OPT_b) | OPT_f);
+- } else
+-#endif
+- if (opt & OPT_n) { /* abort if no lease */
+- bb_error_msg("no lease, failing");
+- retval = 1;
+- goto ret;
+ }
++#endif
+ /* wait before trying again */
+ timeout = tryagain_timeout;
+ packet_num = 0;
+--
+2.13.2
+