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/standalone | |
| parent | c58d0d8d768abdebd6345f675b11c11fcf58c995 (diff) | |
| download | drakx-backup-do-not-use-8422bcac45a35c455210e14b0210514de0218a91.tar drakx-backup-do-not-use-8422bcac45a35c455210e14b0210514de0218a91.tar.gz drakx-backup-do-not-use-8422bcac45a35c455210e14b0210514de0218a91.tar.bz2 drakx-backup-do-not-use-8422bcac45a35c455210e14b0210514de0218a91.tar.xz drakx-backup-do-not-use-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/standalone')
| -rwxr-xr-x | perl-install/standalone/drakconnect | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/perl-install/standalone/drakconnect b/perl-install/standalone/drakconnect index 83591a46a..742e43c01 100755 --- a/perl-install/standalone/drakconnect +++ b/perl-install/standalone/drakconnect @@ -202,16 +202,16 @@ sub manage { $notebook->set_property('show-border', 0); @all_cards = network::ethernet::get_eth_cards($modules_conf); - my $names = network::ethernet::get_eth_cards_names(@all_cards); - foreach (keys %$names) { - my $dev = /eth|ath|wlan/ ? $names->{$_} : $_; + my %names = network::ethernet::get_eth_cards_names(@all_cards); + foreach (keys %names) { + my $dev = /eth|ath|wlan/ ? $names{$_} : $_; $p->{$dev} = { name => $_ , intf => $intf->{$_} }; } while (my ($device, $interface) = each %$intf) { - exists $names->{$device} and next; + exists $names{$device} and next; my $type = network::tools::get_interface_type($interface); $p->{"$type ($device)"} = { name => $device, @@ -671,7 +671,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(@all_cards); + my %ethernet_names = network::ethernet::get_eth_cards_names(@all_cards); my $wiz = { defaultimage => "drakconnect.png", @@ -684,7 +684,7 @@ sub del_intf() { list => [ keys %$intf ], format => sub { my $type = network::tools::get_interface_type($intf->{$_[0]}); - $ethernet_names->{$_[0]} || ($type ? "$type ($_[0])" : $_[0]) + $ethernet_names{$_[0]} || ($type ? "$type ($_[0])" : $_[0]) } } ], |