diff options
| author | Martin Whitaker <mageia@martin-whitaker.me.uk> | 2020-09-15 21:01:47 +0100 |
|---|---|---|
| committer | Martin Whitaker <mageia@martin-whitaker.me.uk> | 2020-09-15 21:01:47 +0100 |
| commit | 2b61a5fb691e757dd45593e1d45f001e5e6b3e12 (patch) | |
| tree | 4f3e1321ca0e25c7c7a1e708a60edae912f4a626 | |
| parent | 2245869de8c370a1a878b8319916675af1f3c973 (diff) | |
| download | drakx-net-2b61a5fb691e757dd45593e1d45f001e5e6b3e12.tar drakx-net-2b61a5fb691e757dd45593e1d45f001e5e6b3e12.tar.gz drakx-net-2b61a5fb691e757dd45593e1d45f001e5e6b3e12.tar.bz2 drakx-net-2b61a5fb691e757dd45593e1d45f001e5e6b3e12.tar.xz drakx-net-2b61a5fb691e757dd45593e1d45f001e5e6b3e12.zip | |
drakfirewall: exclude NM wireless config files when building interface list (mga#8960)
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | lib/network/network.pm | 5 |
2 files changed, 5 insertions, 1 deletions
@@ -1,5 +1,6 @@ - drakfirewall: o add support for SANE server + o exclude NM wireless config files when building interface list (mga#8960) 2.51 - add basic support for connecting to WPA2-PSK network with net_applet when networkmanager is used diff --git a/lib/network/network.pm b/lib/network/network.pm index 9e157a4..bda2d40 100644 --- a/lib/network/network.pm +++ b/lib/network/network.pm @@ -745,8 +745,11 @@ sub read_net_conf { my ($device) = /^ifcfg-([A-Za-z0-9.:_-]+)$/; next if $device =~ /.rpmnew$|.rpmsave$/; if ($device && $device ne 'lo') { + my %vars = getVarsFromSh("$::prefix/etc/sysconfig/network-scripts/$_"); + #- skip NetworkManager wireless config files (mga#8960) + next if $vars{TYPE} eq 'Wireless'; my $intf = findIntf($net, $device); - add2hash($intf, { getVarsFromSh("$::prefix/etc/sysconfig/network-scripts/$_") }); + add2hash($intf, \%vars); $intf->{DEVICE} ||= $device; } } |