From 2b61a5fb691e757dd45593e1d45f001e5e6b3e12 Mon Sep 17 00:00:00 2001
From: Martin Whitaker <mageia@martin-whitaker.me.uk>
Date: Tue, 15 Sep 2020 21:01:47 +0100
Subject: drakfirewall: exclude NM wireless config files when building
 interface list (mga#8960)

---
 lib/network/network.pm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'lib/network/network.pm')

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;
 	}
     }
-- 
cgit v1.2.1