|
 |
1755ca |
From 240c2fea10fda5c84a7725e8711d9cb214a064a9 Mon Sep 17 00:00:00 2001
|
|
|
1755ca |
From: Javier Martinez Canillas <javierm@redhat.com>
|
|
|
1755ca |
Date: Wed, 9 Aug 2017 18:50:44 +0200
|
|
|
1755ca |
Subject: [PATCH] network: Only bring up wired network interfaces
|
|
|
1755ca |
|
|
|
1755ca |
The dracut network module is only supposed to be used for wired interfaces
|
|
|
1755ca |
but if driver modules for wireless devices are wrongly copied, these will
|
|
|
1755ca |
be loaded and the available interfaces brought up.
|
|
|
1755ca |
|
|
|
1755ca |
If the rd.neednet=1 command line parameter is used, dhclient will attempt
|
|
|
1755ca |
to request an IP address for the interfaces and these requests will fail.
|
|
|
1755ca |
|
|
|
1755ca |
But other dracut modules that depend on the network to be settled, will
|
|
|
1755ca |
have to wait for the DHCP requests to timeout. Which can be a lot of time
|
|
|
1755ca |
since the dhclient default timeout value is 60 seconds.
|
|
|
1755ca |
|
|
|
1755ca |
Instead of trying to blacklist all possible kernel modules for wireless
|
|
|
1755ca |
devices, only bring up network interfaces if these are for wired devices.
|
|
|
1755ca |
|
|
|
1755ca |
Suggested-by: Harald Hoyer <harald@redhat.com>
|
|
|
1755ca |
Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
|
|
|
1755ca |
|
|
|
1755ca |
Cherry-picked from: 17927597213854b2fdf15461353882339fdb5051
|
|
|
1755ca |
Resolves: #1480246
|
|
|
1755ca |
---
|
|
|
1755ca |
modules.d/40network/net-genrules.sh | 2 +-
|
|
|
1755ca |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
1755ca |
|
|
|
1755ca |
diff --git a/modules.d/40network/net-genrules.sh b/modules.d/40network/net-genrules.sh
|
|
|
1755ca |
index 08072fbe..c4396f77 100755
|
|
|
1755ca |
--- a/modules.d/40network/net-genrules.sh
|
|
|
1755ca |
+++ b/modules.d/40network/net-genrules.sh
|
|
|
1755ca |
@@ -102,7 +102,7 @@ command -v fix_bootif >/dev/null || . /lib/net-lib.sh
|
|
|
1755ca |
# Default: We don't know the interface to use, handle all
|
|
|
1755ca |
# Fixme: waiting for the interface as well.
|
|
|
1755ca |
else
|
|
|
1755ca |
- cond='ACTION=="add", SUBSYSTEM=="net"'
|
|
|
1755ca |
+ cond='ACTION=="add", SUBSYSTEM=="net", ENV{DEVTYPE}!="wlan|wwan"'
|
|
|
1755ca |
# if you change the name of "91-default-net.rules", also change modules.d/80cms/cmssetup.sh
|
|
|
1755ca |
echo "$cond, $runcmd" > /etc/udev/rules.d/91-default-net.rules
|
|
|
1755ca |
fi
|