diff options
| author | Damien Chaumette <dchaumette@mandriva.com> | 2004-04-19 13:43:27 +0000 |
|---|---|---|
| committer | Damien Chaumette <dchaumette@mandriva.com> | 2004-04-19 13:43:27 +0000 |
| commit | bca995075a481b7742550a695000be00e039635b (patch) | |
| tree | 5be0385874effc75b626951d945d5a978008a45b /perl-install/network | |
| parent | 270a85828ffb2d728ee265a4c58fbd838842a0cb (diff) | |
| download | drakx-bca995075a481b7742550a695000be00e039635b.tar drakx-bca995075a481b7742550a695000be00e039635b.tar.gz drakx-bca995075a481b7742550a695000be00e039635b.tar.bz2 drakx-bca995075a481b7742550a695000be00e039635b.tar.xz drakx-bca995075a481b7742550a695000be00e039635b.zip | |
$adsl_modem is optional, moved to $o_adsl_modem
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 807e57213..9dab12255 100644 --- a/perl-install/network/adsl.pm +++ b/perl-install/network/adsl.pm @@ -65,7 +65,7 @@ If you don't know, choose 'use pppoe'"), }; sub adsl_probe_info { - my ($adsl, $netc, $adsl_type, $adsl_modem) = @_; + my ($adsl, $netc, $adsl_type, $o_adsl_modem) = @_; my $pppoe_file = "$::prefix/etc/ppp/pppoe.conf"; my $pptp_file = "$::prefix/etc/sysconfig/network-scripts/net_cnx_up"; my %pppoe_conf; %pppoe_conf = getVarsFromSh($pppoe_file) if (! defined $adsl_type || $adsl_type eq 'pppoe') && -f $pppoe_file; @@ -75,7 +75,7 @@ sub adsl_probe_info { } ($login) = map { if_(/\sname\s+([^ \n]+)/, $1) } cat_($pptp_file) if (! defined $adsl_type || $adsl_type eq 'pptp') && -r $pptp_file; my $passwd = passwd_by_login($login); - if (!$netc->{vpi} && !$netc->{vpi} && member($adsl_modem, qw(eci speedtouch))) { + if (!$netc->{vpi} && !$netc->{vpi} && member($o_adsl_modem, qw(eci speedtouch))) { ($netc->{vpi}, $netc->{vci}) = (map { if_(/^.*-vpi\s+(\d+)\s+-vci\s+(\d+)/, map { sprintf("%x", $_) } $1, $2) } cat_("$::prefix/etc/ppp/peers/adsl")); } |