Commit e7d83403 authored by Natanael Copa's avatar Natanael Copa
Browse files

main/busybox: increase udhcpc's default discover retries

fixes #3105

(cherry picked from commit 40f54f7f)

Conflicts:
	main/busybox/APKBUILD
parent 2aeefcde
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=busybox
pkgver=1.22.1
pkgrel=8
pkgrel=9
pkgdesc="Size optimized toolbox of many common UNIX utilities"
url=http://busybox.net
arch="all"
......@@ -18,6 +18,7 @@ source="http://busybox.net/downloads/$pkgname-$pkgver.tar.bz2
busybox-uname-is-not-gnu.patch
bb-app-location.patch
loginutils-sha512.patch
udhcpc-discover-retries.patch
busybox-1.22.1-ash.patch
busybox-1.22.1-date.patch
......@@ -119,6 +120,7 @@ d64b58a30892c558bdbab7f0d0997577 nologin.c
b5375210f13fd6e1ca61a565e8fabd35 busybox-uname-is-not-gnu.patch
c5a8dbc8696db6da9c4624b0e11d8fba bb-app-location.patch
8c42c9ef0f0419c314c86bcaf7796106 loginutils-sha512.patch
91a7584a562a72ba886936558e576bbd udhcpc-discover-retries.patch
a2dad16b8d7d29ea8120b6d27cf98529 busybox-1.22.1-ash.patch
bc381f9ceb3824141c968f5bc4353943 busybox-1.22.1-date.patch
24686ec2750a8703feb57fc9c6aaed1d busybox-1.22.1-iplink.patch
......@@ -140,6 +142,7 @@ sha256sums="ae0b029d0a9e4dd71a077a790840e496dd838998e4571b87b60fed7462b6678b bu
a31ce8bcb8b81b20e80ffa407600a530d085806c6471f4e4249fcb3a491b79ef busybox-uname-is-not-gnu.patch
576366b4d50f1078da6c0364ef70415de92d97c93c64f4d790b11d7a34cdccd2 bb-app-location.patch
57674b20158c0b266ed028b0c65299f9cbcad7d33d19c9fcc403d3967daba493 loginutils-sha512.patch
90825a443339f1c8c249d05f7b025ce53e374d305f8e113d98d45146b105494d udhcpc-discover-retries.patch
9917257771ab715480427a6b744785b035d381e7ec0de381faf945bc7abadb97 busybox-1.22.1-ash.patch
8502dd7454e948a56fcd8201f4fe9d629d2844b9df2bacff7ee0bb09398d12e8 busybox-1.22.1-date.patch
186b41734e43ee117cb367055ce6a4d5b3aac671c09d71f2a6347793874d653b busybox-1.22.1-iplink.patch
......@@ -161,6 +164,7 @@ eb7cce973bfd53ce3350713437b9e2751becfb8dfb10b14f27c4f812297c403b90f80dc2906179d4
225c0608972f7daaca672eafdf647eea392e076537287370ca7791931de4803645d4d159385dc2909314028dccba3c64d0c89fa4e1184f856959b17c58459ed1 busybox-uname-is-not-gnu.patch
5c42b05be69c834c9fd5372c6b0d55a6399c74146a94ea09eae7285dd4fa75d1bde38bf7ab73e98638f65eb72db02115453cbdfe85a0085d742940366f617c7d bb-app-location.patch
69af4800fcf765b4ae029daced7ff171b6b04d810c94a987c7ba848e275a27b77b18b38df1b85f4a12c4a47ed42f62e0768260eb1198e2aff1c3cea898b85c61 loginutils-sha512.patch
34415fe69f6b8d42756046aa8e6d9e4f64a3b0ceb9f57c4c988e35870fe975f05d0ac76f1f9a712196e9c59e67aa2a54abf398242009134fb3aca342c25a3646 udhcpc-discover-retries.patch
000bbc9f1b87b676fab5d86c6f535008f2e99e830af9a48354d669b457998044c1d7ac74090f1d2ae56c14eecf88ae9a15eba61c5347f5a9124b518d0f278051 busybox-1.22.1-ash.patch
0836ef682e24fc0e6d660d0d835200d5f4cd863691a6b58d071e40d001923664389f61670037140c2f95deb2080a93c989037308c761ac9304165d83cbfd3d34 busybox-1.22.1-date.patch
f213d11c842841a5b7a6c8b1ffb38719eb038cde220b06f8b5419e63998e21629b0e3f481ad7549d67a764e113abe524d8a7fa0fd9286b8b355a1f20211fd889 busybox-1.22.1-iplink.patch
......
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 */
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment