Mageia Bugzilla – Attachment 11801 Details for
Bug 8960
drakfirewall adds lines longer than IFNAMSIZ (15)-1 to /etc/shorewall/interfaces
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
Log In
[x]
|
New Account
|
Forgot Password
Patch to fix the bug
network.patch (text/plain), 704 bytes, created by
Martin Whitaker
on 2020-08-12 15:50:04 CEST
(
hide
)
Description:
Patch to fix the bug
Filename:
MIME Type:
Creator:
Martin Whitaker
Created:
2020-08-12 15:50:04 CEST
Size:
704 bytes
patch
obsolete
>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; > } > }
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; } }
View Attachment As Raw
Actions:
View
Attachments on
bug 8960
: 11801