diff options
Diffstat (limited to 'perl-install/network')
| -rw-r--r-- | perl-install/network/ethernet.pm | 2 | ||||
| -rw-r--r-- | perl-install/network/netconnect.pm | 2 | ||||
| -rw-r--r-- | perl-install/network/shorewall.pm | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/perl-install/network/ethernet.pm b/perl-install/network/ethernet.pm index a86bff8de..79003d8b3 100644 --- a/perl-install/network/ethernet.pm +++ b/perl-install/network/ethernet.pm @@ -79,7 +79,7 @@ sub get_eth_cards { } sub get_eth_cards_names { - my ($modules_conf, @all_cards) = @_; + my (@all_cards) = @_; { map { $_->[0] => join(': ', $_->[0], $_->[2]) } @all_cards }; } diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm index fb4953e5e..e60d8c050 100644 --- a/perl-install/network/netconnect.pm +++ b/perl-install/network/netconnect.pm @@ -128,7 +128,7 @@ sub real_main { require network::ethernet; modules::interactive::load_category($in, $modules_conf, network::ethernet::get_eth_categories(), !$::expert, 0); @all_cards = network::ethernet::get_eth_cards($modules_conf); - %eth_intf = network::ethernet::get_eth_cards_names($modules_conf, @all_cards); + %eth_intf = network::ethernet::get_eth_cards_names(@all_cards); require list_modules; %eth_intf = map { $_->[0] => join(': ', $_->[0], $_->[2]) } grep { to_bool($is_wireless) == c::isNetDeviceWirelessAware($_->[0]) } @all_cards; diff --git a/perl-install/network/shorewall.pm b/perl-install/network/shorewall.pm index 69fb51ce3..94ce0abb1 100644 --- a/perl-install/network/shorewall.pm +++ b/perl-install/network/shorewall.pm @@ -71,7 +71,7 @@ sub default_interfaces { my $modules_conf = modules::any_conf->read; my @all_cards = network::ethernet::get_eth_cards($modules_conf); -my %net_devices = network::ethernet::get_eth_cards_names($modules_conf, @all_cards); +my %net_devices = network::ethernet::get_eth_cards_names(@all_cards); put_in_hash(\%net_devices, { 'ppp+' => 'ppp+', 'ippp+' => 'ippp+' }); $in->ask_from('', |