summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--perl-install/network/ethernet.pm2
-rw-r--r--perl-install/network/netconnect.pm2
-rw-r--r--perl-install/network/shorewall.pm2
-rwxr-xr-xperl-install/standalone/drakconnect4
-rwxr-xr-xperl-install/standalone/drakgw2
5 files changed, 6 insertions, 6 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('',
diff --git a/perl-install/standalone/drakconnect b/perl-install/standalone/drakconnect
index 0181251ea..7865916b4 100755
--- a/perl-install/standalone/drakconnect
+++ b/perl-install/standalone/drakconnect
@@ -202,7 +202,7 @@ sub manage {
$notebook->set_property('show-border', 0);
@all_cards = network::ethernet::get_eth_cards($modules_conf);
- my %name = network::ethernet::get_eth_cards_names($modules_conf, @all_cards);
+ my %name = network::ethernet::get_eth_cards_names(@all_cards);
foreach (keys %name) {
my $dev = /eth|ath|wlan/ ? $name{$_} : $_;
$p->{$dev} = {
@@ -657,7 +657,7 @@ sub del_intf() {
$in->exit(0);
}
@all_cards = network::ethernet::get_eth_cards($modules_conf);
- my %ethernet_names = network::ethernet::get_eth_cards_names($modules_conf, @all_cards);
+ my %ethernet_names = network::ethernet::get_eth_cards_names(@all_cards);
my $wiz =
{
defaultimage => "drakconnect.png",
diff --git a/perl-install/standalone/drakgw b/perl-install/standalone/drakgw
index bfcdfeedc..4cf70cc1f 100755
--- a/perl-install/standalone/drakgw
+++ b/perl-install/standalone/drakgw
@@ -213,7 +213,7 @@ defined $card_netconnect and log::l("[drakgw] Information from netconnect: ignor
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('',