Mageia Bugzilla – Attachment 5190 Details for
Bug 12883
drakgw: No ethernet network adapter configured for LAN has been detected (regression between mga3 & mga4)
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
Log In
[x]
|
New Account
|
Forgot Password
[patch]
additional test patch
drakgw2.patch (text/plain), 962 bytes, created by
AL13N
on 2014-06-11 08:20:48 CEST
(
hide
)
Description:
additional test patch
Filename:
MIME Type:
Creator:
AL13N
Created:
2014-06-11 08:20:48 CEST
Size:
962 bytes
patch
obsolete
>diff --git a/bin/drakgw b/bin/drakgw >index 76532bd..c710022 100755 >--- a/bin/drakgw >+++ b/bin/drakgw >@@ -125,6 +125,8 @@ What would you like to do?"); #- FIXME : not used for now > data => [ { label => N("Net Device"), val => \$shorewall->{masq}{net_interface}, list => [ sort keys %{$net->{ifcfg}} ], format => sub { network::tools::get_interface_description($net, $_[0]) } } ], > post => sub { > network::shorewall::add_interface_to_net_zone($shorewall, $shorewall->{masq}{net_interface}); >+ # filter out net interface >+ $shorewall->{loc_zone} = [ grep {!/^$shorewall->{masq}{net_interface}$/} @{$shorewall->{loc_zone}} ]; > # if loc_zone is unconfigured and has no interfaces, have all interfaces be local (except the chosen net interface) > $shorewall->{loc_zone} = [ sort grep {!/^$shorewall->{masq}{net_interface}$/} keys %{$net->{ifcfg}} ] if scalar(@{$shorewall->{loc_zone}}) == 0; > my $locals = @{$shorewall->{loc_zone}};
diff --git a/bin/drakgw b/bin/drakgw index 76532bd..c710022 100755 --- a/bin/drakgw +++ b/bin/drakgw @@ -125,6 +125,8 @@ What would you like to do?"); #- FIXME : not used for now data => [ { label => N("Net Device"), val => \$shorewall->{masq}{net_interface}, list => [ sort keys %{$net->{ifcfg}} ], format => sub { network::tools::get_interface_description($net, $_[0]) } } ], post => sub { network::shorewall::add_interface_to_net_zone($shorewall, $shorewall->{masq}{net_interface}); + # filter out net interface + $shorewall->{loc_zone} = [ grep {!/^$shorewall->{masq}{net_interface}$/} @{$shorewall->{loc_zone}} ]; # if loc_zone is unconfigured and has no interfaces, have all interfaces be local (except the chosen net interface) $shorewall->{loc_zone} = [ sort grep {!/^$shorewall->{masq}{net_interface}$/} keys %{$net->{ifcfg}} ] if scalar(@{$shorewall->{loc_zone}}) == 0; my $locals = @{$shorewall->{loc_zone}};
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 12883
:
5019
|
5088
| 5190 |
5191