summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2004-01-26 15:51:26 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2004-01-26 15:51:26 +0000
commit92613c9690d32d5904d63203b57c895fe10a266e (patch)
tree91f91c1eca83810ebccc57d3b2d51b10ce62a87c
parente273a4105a5899089a70ab2b2408dd4f12676825 (diff)
downloaddrakx-92613c9690d32d5904d63203b57c895fe10a266e.tar
drakx-92613c9690d32d5904d63203b57c895fe10a266e.tar.gz
drakx-92613c9690d32d5904d63203b57c895fe10a266e.tar.bz2
drakx-92613c9690d32d5904d63203b57c895fe10a266e.tar.xz
drakx-92613c9690d32d5904d63203b57c895fe10a266e.zip
share provider db for all usb modems (vpi/vci parameters are need for most
modem/protocol combinaisons and anyway it's ok to guess the protocol and dns servers for the end user)
-rw-r--r--perl-install/network/netconnect.pm8
1 files changed, 4 insertions, 4 deletions
diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm
index 496a1d7a4..29aabef96 100644
--- a/perl-install/network/netconnect.pm
+++ b/perl-install/network/netconnect.pm
@@ -544,18 +544,18 @@ killall pppd
return 'adsl_unsupported_eci' if $adsl_device eq 'eci';
$netconnect::need_restart_network = member($adsl_device, qw(speedtouch eci));
$in->do_pkgs->ensure_is_installed(@{$packages{$adsl_device}}) if $packages{$adsl_device};
- return 'adsl_sagem800' if $adsl_device eq 'sagem';
if ($adsl_device eq 'speedtouch' && !$::testing) {
$in->do_pkgs->what_provides("speedtouch_mgmt") and
$in->do_pkgs->ensure_is_installed('speedtouch_mgmt', '/usr/share/speedtouch/mgmt.o', 'auto');
return 'adsl_speedtouch_firmware' if ! -e "$prefix/usr/share/speedtouch/mgmt.o";
}
+ return 'adsl_provider' if $adsl_devices{$adsl_device};
return 'adsl_protocol';
},
},
- adsl_sagem800 =>
+ adsl_provider =>
{
pre => sub {
require network::adsl_consts;
@@ -609,7 +609,7 @@ or skip and do it later."),
# kept translations b/c we may want to reuse it later:
N("Firmware copy succeeded");
- return $adsl_failed ? 'adsl_copy_firmware_failled' : 'adsl_protocol';
+ return $adsl_failed ? 'adsl_copy_firmware_failled' : 'adsl_provider';
},
},
@@ -617,7 +617,7 @@ or skip and do it later."),
adsl_copy_firmware_failled =>
{
name => sub { $adsl_failed },
- next => 'adsl_protocol',
+ next => 'adsl_provider',
},