From: Lukas Nykryn <lnykryn@redhat.com>
Date: Thu, 9 Jan 2020 09:49:52 +0000 (+0100)
Subject: network-legacy/ifup: dhclient should be started in oneshot mode
X-Git-Tag: 050~77
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2181c80c91f05bfae5e50de2f502e363b0219bae;p=thirdparty%2Fdracut.git

network-legacy/ifup: dhclient should be started in oneshot mode

since we handle the retries explicitly via rd.net.dhcp.retry

Without -1 if user sets ip=dhcp6 and there is no dhcp on the network,
dhclient seems to wait indefinitely, ignoring rd.net.timeout.dhcp
---

diff --git a/modules.d/35network-legacy/ifup.sh b/modules.d/35network-legacy/ifup.sh
index 736a11288..eda88ca35 100755
--- a/modules.d/35network-legacy/ifup.sh
+++ b/modules.d/35network-legacy/ifup.sh
@@ -52,6 +52,7 @@ do_dhcp() {
         dhclient "$@" \
                  ${_timeout:+--timeout $_timeout} \
                  -q \
+                 -1 \
                  -cf /etc/dhclient.conf \
                  -pf /tmp/dhclient.$netif.pid \
                  -lf /tmp/dhclient.$netif.lease \