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