]> git.ipfire.org Git - thirdparty/dracut.git/commitdiff
network-legacy/ifup: dhclient should be started in oneshot mode
authorLukas Nykryn <lnykryn@redhat.com>
Thu, 9 Jan 2020 09:49:52 +0000 (10:49 +0100)
committerHarald Hoyer <harald@hoyer.xyz>
Tue, 14 Jan 2020 08:16:48 +0000 (09:16 +0100)
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

modules.d/35network-legacy/ifup.sh

index 736a112880f1e586ca0e36811e7a23b0d4347669..eda88ca35c763d4e2e9d9b0a9e2ca1350224d7cf 100755 (executable)
@@ -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 \