From b8697fd33f14a3f4ad1d7ecba59c1ca8853bc01f Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Thu, 13 Jan 2005 09:55:41 +0000 Subject: fix bugzilla #12996 --- perl-install/network/shorewall.pm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/perl-install/network/shorewall.pm b/perl-install/network/shorewall.pm index cafb128be..9c9628635 100644 --- a/perl-install/network/shorewall.pm +++ b/perl-install/network/shorewall.pm @@ -67,9 +67,9 @@ sub default_interfaces { my @l = detect_devices::getNet() or return; 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 @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+' }); $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 ]; -- cgit v1.2.1