diff options
author | Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> | 2019-02-22 22:51:35 -0600 |
---|---|---|
committer | Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> | 2019-02-22 22:51:35 -0600 |
commit | 4618f5695b7bd00c07d656e965db11b31f0d8b36 (patch) | |
tree | 9a3b5f59245e5e3e1183fd56ae907a06c588d1f1 /system/busybox/0012-udhcpc-Don-t-background-if-n-is-given.patch | |
parent | d397ab02f9c6c4e5a0ac0a2d5331999d056ae27b (diff) | |
download | packages-4618f5695b7bd00c07d656e965db11b31f0d8b36.tar.gz packages-4618f5695b7bd00c07d656e965db11b31f0d8b36.tar.bz2 packages-4618f5695b7bd00c07d656e965db11b31f0d8b36.tar.xz packages-4618f5695b7bd00c07d656e965db11b31f0d8b36.zip |
{system => legacy}/busybox: fucking inflatable fucking busybox
Diffstat (limited to 'system/busybox/0012-udhcpc-Don-t-background-if-n-is-given.patch')
-rw-r--r-- | system/busybox/0012-udhcpc-Don-t-background-if-n-is-given.patch | 45 |
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 - |