diff options
| author | Thierry Vignaud <tvignaud@mandriva.org> | 2004-02-23 08:27:34 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tvignaud@mandriva.org> | 2004-02-23 08:27:34 +0000 |
| commit | 501a02f5214c484a368752281a7839cdd5ececab (patch) | |
| tree | 4f96d2934fc28edbf1e325763ef3d844ca714f91 | |
| parent | 07451b93da9f6690aa71609efde7f5cb9b8f8104 (diff) | |
| download | drakx-501a02f5214c484a368752281a7839cdd5ececab.tar drakx-501a02f5214c484a368752281a7839cdd5ececab.tar.gz drakx-501a02f5214c484a368752281a7839cdd5ececab.tar.bz2 drakx-501a02f5214c484a368752281a7839cdd5ececab.tar.xz drakx-501a02f5214c484a368752281a7839cdd5ececab.zip | |
handle unknown hardware: enable one to manually load a driver like expert mode
in old pre-10.0 wizard
| -rw-r--r-- | perl-install/network/netconnect.pm | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm index f51616391..72ee7810d 100644 --- a/perl-install/network/netconnect.pm +++ b/perl-install/network/netconnect.pm @@ -718,18 +718,15 @@ You can find a driver on http://eciadsl.flashtux.org/"), pre => $lan_detect, name => N("Select the network interface to configure:"), data => sub { - [ { label => N("Net Device"), type => "list", val => \$ntf_name, list => [ sort keys %eth_intf ], - allow_empty_list => 1, format => sub { $eth_intf{$_[0]} } } ]; - }, - complete => sub { - if (!keys %eth_intf) { - $in->ask_warn(N("Error"), $is_wireless ? N("No wireless network adapter on your system!") - : N("No network adapter on your system!")); - return 1; - }; + [ { label => N("Net Device"), type => "list", val => \$ntf_name, list => [ N("Manual choice"), sort keys %eth_intf ], + allow_empty_list => 1, format => sub { $eth_intf{$_[0]} || $_[0]} } ]; }, post => sub { $ethntf = $intf->{$ntf_name} ||= { DEVICE => $ntf_name }; + if ($ntf_name eq N("Manual choice")) { + modules::interactive::load_category__prompt($in, 'network/main|gigabit|pcmcia|usb|wireless'); + return 'lan'; + } $::isInstall && $netc->{NET_DEVICE} eq $ethntf->{DEVICE} ? 'lan_alrd_cfg' : 'lan_protocol'; }, }, |