Merge branch 'busyborks' into 'master'

Deprecate busybox package due to insane maintanership burden nobody is willing to take up.



See merge request !183

1 files changed, 0 insertions, 45 deletions

diff --git a/system/busybox/0012-udhcpc-Don-t-background-if-n-is-given.patch b/system/busybox/0012-udhcpc-Don-t-background-if-n-is-given.patch
deleted file mode 100644
index 50719b003..000000000
--- a/system/busybox/0012-udhcpc-Don-t-background-if-n-is-given.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 7f3d0620051c30e2047593092aa054565756b57f Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Thu, 6 Jul 2017 13:39:15 +0200
-Subject: [PATCH 12/16] 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 cc1d22c8e..10b846b0a 100644
---- a/networking/udhcp/dhcpc.c
-+++ b/networking/udhcp/dhcpc.c
-@@ -1479,19 +1479,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.16.2
-