summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2005-01-19 09:47:15 +0000
committerPascal Rigaux <pixel@mandriva.com>2005-01-19 09:47:15 +0000
commit70be8693d0261dd1ea270d5047bb5ab64f89dfbc (patch)
tree75e908c2e25139fc4de3cb47ac756bf40c5b500d
parente2e3479d2e31bfd7d31b6fe6a176c83354196543 (diff)
downloaddrakx-backup-do-not-use-70be8693d0261dd1ea270d5047bb5ab64f89dfbc.tar
drakx-backup-do-not-use-70be8693d0261dd1ea270d5047bb5ab64f89dfbc.tar.gz
drakx-backup-do-not-use-70be8693d0261dd1ea270d5047bb5ab64f89dfbc.tar.bz2
drakx-backup-do-not-use-70be8693d0261dd1ea270d5047bb5ab64f89dfbc.tar.xz
drakx-backup-do-not-use-70be8693d0261dd1ea270d5047bb5ab64f89dfbc.zip
adapt to new network::ethernet::get_eth_cards_names() prototype
-rwxr-xr-xperl-install/standalone/drakconnect12
1 files changed, 6 insertions, 6 deletions
diff --git a/perl-install/standalone/drakconnect b/perl-install/standalone/drakconnect
index bb45f2336..83591a46a 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 %name = network::ethernet::get_eth_cards_names(@all_cards);
- foreach (keys %name) {
- my $dev = /eth|ath|wlan/ ? $name{$_} : $_;
+ 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 $name{$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])
}
}
],