summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2004-01-24 16:13:52 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2004-01-24 16:13:52 +0000
commitc091eb3a32eceba141d5197fae1f1f64090917f5 (patch)
treed246dc3c8d0115501fdc4143dab781bd3bd5a8d4 /perl-install
parentc7776a7a64793a11e0bcd3f73e8d3ec541f2e6d0 (diff)
downloaddrakx-backup-do-not-use-c091eb3a32eceba141d5197fae1f1f64090917f5.tar
drakx-backup-do-not-use-c091eb3a32eceba141d5197fae1f1f64090917f5.tar.gz
drakx-backup-do-not-use-c091eb3a32eceba141d5197fae1f1f64090917f5.tar.bz2
drakx-backup-do-not-use-c091eb3a32eceba141d5197fae1f1f64090917f5.tar.xz
drakx-backup-do-not-use-c091eb3a32eceba141d5197fae1f1f64090917f5.zip
factorize lan module search for adsl through ethernet
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/network/netconnect.pm4
1 files changed, 3 insertions, 1 deletions
diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm
index b61192287..585588dba 100644
--- a/perl-install/network/netconnect.pm
+++ b/perl-install/network/netconnect.pm
@@ -144,6 +144,8 @@ sub get_subwizard {
modules::add_alias($card->[0], $card->[1]);
}
};
+
+ my $find_lan_module = sub { $module ||= (find { $_->[0] eq $ethntf->{DEVICE} } @all_cards)->[1] };
my %adsl_devices = (
speedtouch => N("Alcatel speedtouch USB modem"),
@@ -690,7 +692,7 @@ Modifying the fields below will override this configuration."),
lan_protocol =>
{
pre => sub {
- $module ||= (find { $_->[0] eq $ethntf->{DEVICE} } @all_cards)->[1];
+ $find_lan_module->();
$auto_ip = $l10n_lan_protocols{defined $auto_ip ? ($auto_ip ? 'dhcp' : 'static') :$ethntf->{BOOTPROTO}} || 0;
},
name => sub {