summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.org>2005-03-30 13:38:16 +0000
committerOlivier Blin <oblin@mandriva.org>2005-03-30 13:38:16 +0000
commitf962f7d1c1240dbc4ca186b58df8341a0646d094 (patch)
tree92ede3c71e4805fc545ebff157d0efdf053c8650
parent5498df49ccbb0f4b9f64baf693fcd12e88b75862 (diff)
downloaddrakx-backup-do-not-use-f962f7d1c1240dbc4ca186b58df8341a0646d094.tar
drakx-backup-do-not-use-f962f7d1c1240dbc4ca186b58df8341a0646d094.tar.gz
drakx-backup-do-not-use-f962f7d1c1240dbc4ca186b58df8341a0646d094.tar.bz2
drakx-backup-do-not-use-f962f7d1c1240dbc4ca186b58df8341a0646d094.tar.xz
drakx-backup-do-not-use-f962f7d1c1240dbc4ca186b58df8341a0646d094.zip
eagle-usb: try to use the country specific CMV
-rw-r--r--perl-install/network/adsl.pm5
1 files changed, 5 insertions, 0 deletions
diff --git a/perl-install/network/adsl.pm b/perl-install/network/adsl.pm
index 28147b12b..9748e16d0 100644
--- a/perl-install/network/adsl.pm
+++ b/perl-install/network/adsl.pm
@@ -110,7 +110,12 @@ sub sagem_set_parameters {
#- create CMV symlinks for both POTS and ISDN lines
foreach my $type (qw(p i)) {
my $cmv;
+ my ($country) = $netc->{provider_id} =~ /^([a-zA-Z]+)\d+$/;
+ #- try to find a CMV for this specific ISP
$cmv = "$::prefix/etc/eagle-usb/CMVe${type}$netc->{provider_id}.txt" if $netc->{provider_id};
+ #- if not found, try to found a CMV for the country
+ -f $cmv or $cmv = "$::prefix/etc/eagle-usb/CMVe${type}${country}.txt";
+ #- fallback on the generic CMV if no other matched
-f $cmv or $cmv = "$::prefix/etc/eagle-usb/CMVe${type}WO.txt";
symlinkf($cmv, "$::prefix/etc/eagle-usb/CMVe${type}.txt");
}