diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2005-01-20 17:46:53 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2005-01-20 17:46:53 +0000 |
| commit | 8422bcac45a35c455210e14b0210514de0218a91 (patch) | |
| tree | cd5205868f59be7673e84aa366d9a3c32b414e24 /perl-install/network | |
| parent | c58d0d8d768abdebd6345f675b11c11fcf58c995 (diff) | |
| download | drakx-8422bcac45a35c455210e14b0210514de0218a91.tar drakx-8422bcac45a35c455210e14b0210514de0218a91.tar.gz drakx-8422bcac45a35c455210e14b0210514de0218a91.tar.bz2 drakx-8422bcac45a35c455210e14b0210514de0218a91.tar.xz drakx-8422bcac45a35c455210e14b0210514de0218a91.zip | |
restore previous network::ethernet::get_eth_cards_names() behaviour
(i got hit by { map ... }; being a block and not a hash ref)
Diffstat (limited to 'perl-install/network')
| -rw-r--r-- | perl-install/network/ethernet.pm | 2 | ||||
| -rw-r--r-- | perl-install/network/shorewall.pm | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/perl-install/network/ethernet.pm b/perl-install/network/ethernet.pm index 66562b5ed..84d828a41 100644 --- a/perl-install/network/ethernet.pm +++ b/perl-install/network/ethernet.pm @@ -96,7 +96,7 @@ sub get_eth_cards { sub get_eth_cards_names { my (@all_cards) = @_; - +{ map { $_->[0] => join(': ', $_->[0], $_->[2]) } @all_cards }; + map { $_->[0] => join(': ', $_->[0], $_->[2]) } @all_cards; } #- returns (link_type, mac_address) diff --git a/perl-install/network/shorewall.pm b/perl-install/network/shorewall.pm index 9c9628635..9a313ec3a 100644 --- a/perl-install/network/shorewall.pm +++ b/perl-install/network/shorewall.pm @@ -68,8 +68,8 @@ 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(@all_cards); - put_in_hash($net_devices, { 'ppp+' => 'ppp+', 'ippp+' => 'ippp+' }); + my %net_devices = network::ethernet::get_eth_cards_names(@all_cards); + put_in_hash(\%net_devices, { 'ppp+' => 'ppp+', 'ippp+' => 'ippp+' }); $in->ask_from('', N("Please enter the name of the interface connected to the internet. @@ -79,7 +79,7 @@ Examples: eth0, or eth1 for cable connection, ippp+ for a isdn connection. "), - [ { label => N("Net Device"), val => \$card_netconnect, list => [ sort keys %$net_devices ], format => sub { $net_devices->{$_[0]} || $_[0] }, not_edit => 0 } ]); + [ { label => N("Net Device"), val => \$card_netconnect, list => [ sort keys %net_devices ], format => sub { $net_devices{$_[0]} || $_[0] }, not_edit => 0 } ]); $conf{net_interface} = $card_netconnect; $conf{loc_interface} = [ grep { $_ ne $conf{net_interface} } @l ]; |