summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2004-01-21 17:20:09 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2004-01-21 17:20:09 +0000
commit9cc20938eb0d49b3a4eeed3e217e624c5f2ce008 (patch)
tree41e464cb1d1cc308f6779ce4be597c98c2154008 /perl-install
parent9838589ada018d20e5fa895590513e7103545431 (diff)
downloaddrakx-backup-do-not-use-9cc20938eb0d49b3a4eeed3e217e624c5f2ce008.tar
drakx-backup-do-not-use-9cc20938eb0d49b3a4eeed3e217e624c5f2ce008.tar.gz
drakx-backup-do-not-use-9cc20938eb0d49b3a4eeed3e217e624c5f2ce008.tar.bz2
drakx-backup-do-not-use-9cc20938eb0d49b3a4eeed3e217e624c5f2ce008.tar.xz
drakx-backup-do-not-use-9cc20938eb0d49b3a4eeed3e217e624c5f2ce008.zip
factorize lan detection (needed for adsl)
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/network/netconnect.pm22
1 files changed, 12 insertions, 10 deletions
diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm
index 583df2e13..d5cabc980 100644
--- a/perl-install/network/netconnect.pm
+++ b/perl-install/network/netconnect.pm
@@ -132,6 +132,17 @@ sub get_subwizard {
return $::isInstall ? "network_on_boot" : "apply_settings";
}
};
+
+ my $lan_detect = sub {
+ detect($netc->{autodetect}, 'lan') if !$::isInstall;
+ modules::interactive::load_category($in, 'network/main|gigabit|usb|pcmcia', !$::expert, 1);
+ @all_cards = network::ethernet::conf_network_card_backend($netc, $intf);
+ @cards = map { $_->[0] } @all_cards;
+ foreach my $card (@all_cards) {
+ modules::remove_alias($card->[1]);
+ modules::add_alias($card->[0], $card->[1]);
+ }
+ };
# main wizard:
my $wiz;
@@ -501,16 +512,7 @@ killall pppd
lan =>
{
- pre => sub {
- detect($netc->{autodetect}, 'lan') if !$::isInstall;
- modules::interactive::load_category($in, 'network/main|gigabit|usb|pcmcia', !$::expert, 1);
- @all_cards = network::ethernet::conf_network_card_backend($netc, $intf);
- @cards = map { $_->[0] } @all_cards;
- foreach my $card (@all_cards) {
- modules::remove_alias($card->[1]);
- modules::add_alias($card->[0], $card->[1]);
- }
- },
+ pre => $lan_detect,
name => N("Select the network interface to configure:"),
data => [ { label => N("Net Device"), type => "list", val => \$ntf_name, list => [ detect_devices::getNet() ], allow_empty_list => 1 } ],
post => sub {