From: Lukas Nykryn <lnykryn@redhat.com>
Date: Mon, 10 Feb 2020 13:03:30 +0000 (+0100)
Subject: 40network: bump rd.net.timeout.carrier to 10 seconds
X-Git-Tag: 050~62
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=579fbb9fc4205dc216b9642238739d898d2ed02d;p=thirdparty%2Fdracut.git

40network: bump rd.net.timeout.carrier to 10 seconds

On some devices kernel currently takes 5.2 seconds to detect carrier,
so let's make the default in dracut bit more sensible.

See also https://bugzilla.redhat.com/show_bug.cgi?id=1772010
---

diff --git a/dracut.cmdline.7.asc b/dracut.cmdline.7.asc
index 6e0279cf1..768368561 100644
--- a/dracut.cmdline.7.asc
+++ b/dracut.cmdline.7.asc
@@ -674,7 +674,7 @@ NFS
     Wait <seconds> until IPv6 automatic addresses are assigned. Default is 40 seconds.
 
 **rd.net.timeout.carrier=**__<seconds>__::
-    Wait <seconds> until carrier is recognized. Default is 5 seconds.
+    Wait <seconds> until carrier is recognized. Default is 10 seconds.
 
 CIFS
 ~~~
diff --git a/modules.d/40network/net-lib.sh b/modules.d/40network/net-lib.sh
index 59457bbcb..b8ee116ec 100755
--- a/modules.d/40network/net-lib.sh
+++ b/modules.d/40network/net-lib.sh
@@ -718,7 +718,7 @@ iface_has_carrier() {
     interface="/sys/class/net/$interface"
     [ -d "$interface" ] || return 2
     local timeout="$(getargs rd.net.timeout.carrier=)"
-    timeout=${timeout:-5}
+    timeout=${timeout:-10}
     timeout=$(($timeout*10))
 
     linkup "$1"