diff options
| author | Francois Pons <fpons@mandriva.com> | 2003-02-27 21:36:15 +0000 |
|---|---|---|
| committer | Francois Pons <fpons@mandriva.com> | 2003-02-27 21:36:15 +0000 |
| commit | 24b510d9ae2582bb103a9178286fc990980c248e (patch) | |
| tree | a508e315cd3d8a1cbbe772ddf08c67b0f8153672 /perl-install/network | |
| parent | 408e6e11236fd1b333e9a4eab7ad50d5583efde4 (diff) | |
| download | drakx-24b510d9ae2582bb103a9178286fc990980c248e.tar drakx-24b510d9ae2582bb103a9178286fc990980c248e.tar.gz drakx-24b510d9ae2582bb103a9178286fc990980c248e.tar.bz2 drakx-24b510d9ae2582bb103a9178286fc990980c248e.tar.xz drakx-24b510d9ae2582bb103a9178286fc990980c248e.zip | |
probe user and password in /etc/ppp/options.adsl too (as produced by original eagle installation),
sagem adsl type connection does not need to configure an ethernet connection.
Diffstat (limited to 'perl-install/network')
| -rw-r--r-- | perl-install/network/adsl.pm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/perl-install/network/adsl.pm b/perl-install/network/adsl.pm index 4dab50c90..1fccc709f 100644 --- a/perl-install/network/adsl.pm +++ b/perl-install/network/adsl.pm @@ -74,7 +74,7 @@ sub adsl_ask_info { my $pppoe_file = "/etc/ppp/pppoe.conf"; my %pppoe_conf; %pppoe_conf = getVarsFromSh($pppoe_file) if $adsl_type =~ /pppoe/ && -f $pppoe_file; my $login = $pppoe_conf{USER}; - foreach (qw(/etc/ppp/peers/adsl /etc/ppp/options)) { + foreach (qw(/etc/ppp/peers/adsl /etc/ppp/options /etc/ppp/options.adsl)) { next if $login && ! -r $_; ($login) = map { if_(/^user\s+\"([^\"]+)\"/, $1) } cat_($_); } @@ -105,7 +105,7 @@ sub adsl_conf { adsl_conf_step_1: adsl_ask_info($adsl, $netc, $intf, $adsl_type) or return; adsl_conf_step_2: - $adsl_type =~ /speedtouch|eci/ or conf_network_card($netc, $intf, 'static', '10.0.0.10') or goto adsl_conf_step_1; + $adsl_type =~ /sagem|speedtouch|eci/ or conf_network_card($netc, $intf, 'static', '10.0.0.10') or goto adsl_conf_step_1; adsl_conf_backend($adsl, $netc, $adsl_type); 1; } |