From 286c8a1166659bf6c5fd0cdd097e10b1468112c9 Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Fri, 17 Oct 2014 19:58:53 +0200 Subject: [PATCH] busybox: Make sure we keep re-trying to obtain a lease CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS was set to '-n' which means "Exit with failure if lease cannot be immediately negotiated." What we'd rather want is for udhcpc to continue to run until a lease can finally obtain. Otherwise we have a race condition in case the DHCP server is not reachable for a few seconds during system boot, and end up having a system that is permanently without an IP address. This fixes ORT#639 --- recipes-core/busybox/busybox-1.21.1/defconfig | 2 +- recipes-core/busybox/busybox-1.22.1/defconfig | 2 +- recipes-core/busybox/busybox_sysmocom.inc | 2 +- recipes-core/busybox/files/defconfig | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/recipes-core/busybox/busybox-1.21.1/defconfig b/recipes-core/busybox/busybox-1.21.1/defconfig index ea4226e..f8cf666 100644 --- a/recipes-core/busybox/busybox-1.21.1/defconfig +++ b/recipes-core/busybox/busybox-1.21.1/defconfig @@ -854,7 +854,7 @@ CONFIG_UDHCP_DEBUG=0 # CONFIG_FEATURE_UDHCP_8021Q is not set CONFIG_UDHCPC_DEFAULT_SCRIPT="/usr/share/udhcpc/default.script" CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80 -CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-R -n" +CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-R -b" # CONFIG_UDPSVD is not set # CONFIG_VCONFIG is not set CONFIG_WGET=y diff --git a/recipes-core/busybox/busybox-1.22.1/defconfig b/recipes-core/busybox/busybox-1.22.1/defconfig index 684dc02..4bef60a 100644 --- a/recipes-core/busybox/busybox-1.22.1/defconfig +++ b/recipes-core/busybox/busybox-1.22.1/defconfig @@ -854,7 +854,7 @@ CONFIG_UDHCP_DEBUG=0 # CONFIG_FEATURE_UDHCP_8021Q is not set CONFIG_UDHCPC_DEFAULT_SCRIPT="/usr/share/udhcpc/default.script" CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80 -CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-R -n" +CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-R -b" # CONFIG_UDPSVD is not set # CONFIG_VCONFIG is not set CONFIG_WGET=y diff --git a/recipes-core/busybox/busybox_sysmocom.inc b/recipes-core/busybox/busybox_sysmocom.inc index 270a788..a3b9c96 100644 --- a/recipes-core/busybox/busybox_sysmocom.inc +++ b/recipes-core/busybox/busybox_sysmocom.inc @@ -1,6 +1,6 @@ SYSMOCOM := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}" FILESEXTRAPATHS_prepend := "${SYSMOCOM}/busybox-${SYSMOCOM_ORIG_PV}:${SYSMOCOM}/files:" -PRINC = "21" +PRINC = "22" SRC_URI += "file://busybox-ifplugd.sh \ file://ifplugd.sh" diff --git a/recipes-core/busybox/files/defconfig b/recipes-core/busybox/files/defconfig index 7669558..cfc02e7 100644 --- a/recipes-core/busybox/files/defconfig +++ b/recipes-core/busybox/files/defconfig @@ -776,7 +776,7 @@ CONFIG_UDHCP_DEBUG=0 # CONFIG_FEATURE_UDHCP_RFC3397 is not set CONFIG_UDHCPC_DEFAULT_SCRIPT="/usr/share/udhcpc/default.script" CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80 -CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-R -n" +CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-R -b" # CONFIG_VCONFIG is not set CONFIG_WGET=y CONFIG_FEATURE_WGET_STATUSBAR=y