diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2014-08-01 14:29:47 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2015-04-14 12:38:09 +0000 |
| commit | f32070d95b6eb61ef79330a1ceea0412706d976b (patch) | |
| tree | ac181b687d296fd26eeeb9bcbb6def141c013747 /main/busybox | |
| parent | 1cf3c57484223ea793075ddc37e6f1ad8b52022d (diff) | |
| download | aports-f32070d95b6eb61ef79330a1ceea0412706d976b.tar.bz2 aports-f32070d95b6eb61ef79330a1ceea0412706d976b.tar.xz | |
main/busybox: increase udhcpc's default discover retries
ref #3105
(cherry picked from commit 40f54f7ffe4463a66b9060c1dc39fb4c41823f98)
Conflicts:
main/busybox/APKBUILD
Diffstat (limited to 'main/busybox')
| -rw-r--r-- | main/busybox/APKBUILD | 6 | ||||
| -rw-r--r-- | main/busybox/udhcpc-discover-retries.patch | 13 |
2 files changed, 18 insertions, 1 deletions
diff --git a/main/busybox/APKBUILD b/main/busybox/APKBUILD index 4e9327d8b8..a1e8ba1a3e 100644 --- a/main/busybox/APKBUILD +++ b/main/busybox/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=busybox pkgver=1.21.1 -pkgrel=1 +pkgrel=2 pkgdesc="Size optimized toolbox of many common UNIX utilities" url=http://busybox.net arch="all" @@ -20,6 +20,7 @@ source="http://busybox.net/downloads/$pkgname-$pkgver.tar.bz2 loginutils-sha512.patch busybox-musl-fixes.patch addgroup.patch + udhcpc-discover-retries.patch 0001-ifupdown-pass-interface-device-name-for-ipv6-route-c.patch 0001-ifupdown-use-x-hostname-NAME-with-udhcpc.patch @@ -110,6 +111,7 @@ c5a8dbc8696db6da9c4624b0e11d8fba bb-app-location.patch 8c42c9ef0f0419c314c86bcaf7796106 loginutils-sha512.patch f718d6d53b6cd1e012edcee32686a846 busybox-musl-fixes.patch cdd7e88338f6858d7715a4328afcfc50 addgroup.patch +91a7584a562a72ba886936558e576bbd udhcpc-discover-retries.patch 04eeda8c49d4688e6dec02451f8b6aae 0001-ifupdown-pass-interface-device-name-for-ipv6-route-c.patch e1c183cbe1ca18a0fa0d9597314076c9 0001-ifupdown-use-x-hostname-NAME-with-udhcpc.patch b4e7c47c05c1fdaee0a418731e1d1135 busyboxconfig @@ -123,6 +125,7 @@ a31ce8bcb8b81b20e80ffa407600a530d085806c6471f4e4249fcb3a491b79ef busybox-uname- 57674b20158c0b266ed028b0c65299f9cbcad7d33d19c9fcc403d3967daba493 loginutils-sha512.patch 06e0804532b1253019061078c3cd0a46cba74cb8a32a2d3f80cec23e04fa0386 busybox-musl-fixes.patch feb28cb9f3476fc7d370f9873e4072cffabdef7c80e0dbc4a577ef41d42cd40f addgroup.patch +90825a443339f1c8c249d05f7b025ce53e374d305f8e113d98d45146b105494d udhcpc-discover-retries.patch 2e9d56335ca39e944b9abd9ecc91d0e47a3fe3434f8b7ec3f526bc8fa0895ada 0001-ifupdown-pass-interface-device-name-for-ipv6-route-c.patch 53563c6dc4db13004d0b37f7bf1748e861b5a5c4244c1d34f102c23b689420c5 0001-ifupdown-use-x-hostname-NAME-with-udhcpc.patch 7774d71ddab017c4e436bc575637bd54e3936a7e82574756afced8e1e0077c57 busyboxconfig @@ -136,6 +139,7 @@ eb7cce973bfd53ce3350713437b9e2751becfb8dfb10b14f27c4f812297c403b90f80dc2906179d4 69af4800fcf765b4ae029daced7ff171b6b04d810c94a987c7ba848e275a27b77b18b38df1b85f4a12c4a47ed42f62e0768260eb1198e2aff1c3cea898b85c61 loginutils-sha512.patch eed527c8cab79347ed786929c36da76028bf9592a4f047706c3ce14bc96787fc7e685441eca14006eab88b0b8d5ed939116daea95110fa0f87f8b94b1f5e9673 busybox-musl-fixes.patch 6f10ce677b7968a1b814a955c057a0a278b8c6a93621420756c2698f95a4b730657785b9ab51c88c5bc54d28aca1776d38530064bac8c588c791e1e243326e2f addgroup.patch +34415fe69f6b8d42756046aa8e6d9e4f64a3b0ceb9f57c4c988e35870fe975f05d0ac76f1f9a712196e9c59e67aa2a54abf398242009134fb3aca342c25a3646 udhcpc-discover-retries.patch f2ed7bf994766a20ceecb28bea8c66307b6b66cdd7099408b1f29a529786ce07e55824b21256321708663e00d6fe9428480b0d3e121b67d6ebd8a8a87b1486d1 0001-ifupdown-pass-interface-device-name-for-ipv6-route-c.patch b1a1cc2ada657a3d3364c8c96853575d73784e769cd8768c170c27a3e59abd2beace75dff6d5047c4391725e961d93149f9c3f45ed75fb1c582bf18b818282c9 0001-ifupdown-use-x-hostname-NAME-with-udhcpc.patch 373b23c3a0db5353dc19bc1f758ec1ebaec82a05f99ac1ab839b95c94e6214f1c252b6b39fcd56cd5f0e0b3bd6c32bd9dde72a4afa5be49c49b6bc9190a8776f busyboxconfig diff --git a/main/busybox/udhcpc-discover-retries.patch b/main/busybox/udhcpc-discover-retries.patch new file mode 100644 index 0000000000..e4a631c279 --- /dev/null +++ b/main/busybox/udhcpc-discover-retries.patch @@ -0,0 +1,13 @@ +Some slower nics needs more attempts to get a lease + +--- ./networking/udhcp/dhcpc.c.orig ++++ ./networking/udhcp/dhcpc.c +@@ -1238,7 +1238,7 @@ + llist_t *list_x = NULL; + int tryagain_timeout = 20; + int discover_timeout = 3; +- int discover_retries = 3; ++ int discover_retries = 5; + uint32_t server_addr = server_addr; /* for compiler */ + uint32_t requested_ip = 0; + uint32_t xid = xid; /* for compiler */ |