diff options
| author | Olivier Blin <oblin@mandriva.org> | 2005-09-16 14:37:50 +0000 |
|---|---|---|
| committer | Olivier Blin <oblin@mandriva.org> | 2005-09-16 14:37:50 +0000 |
| commit | c0f8ad929ceccbea5f6ed9677034b61b6c39bc39 (patch) | |
| tree | 184a4c3cc788dd9eb456cb6dfeb4ebf37a687033 /perl-install/network/netconnect.pm | |
| parent | efa665b8d98cf83c3431e0c2f3dd80672cecc5cf (diff) | |
| download | drakx-c0f8ad929ceccbea5f6ed9677034b61b6c39bc39.tar drakx-c0f8ad929ceccbea5f6ed9677034b61b6c39bc39.tar.gz drakx-c0f8ad929ceccbea5f6ed9677034b61b6c39bc39.tar.bz2 drakx-c0f8ad929ceccbea5f6ed9677034b61b6c39bc39.tar.xz drakx-c0f8ad929ceccbea5f6ed9677034b61b6c39bc39.zip | |
simplify pppoe configuration code
Diffstat (limited to 'perl-install/network/netconnect.pm')
| -rw-r--r-- | perl-install/network/netconnect.pm | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm index a9c76b3fb..f3df13cc3 100644 --- a/perl-install/network/netconnect.pm +++ b/perl-install/network/netconnect.pm @@ -748,6 +748,7 @@ If you do not know it, keep the preselected type."), $auto_ip = $net->{adsl}{method} eq 'dhcp'; return 'lan_intf'; } + member($net->{adsl}{method}, qw(pppoe pptp)) and $net->{adsl}{ethernet_device} = $ntf_name; return 'adsl_account'; }, }, @@ -757,7 +758,6 @@ If you do not know it, keep the preselected type."), { pre => sub { network::adsl::adsl_probe_info($net); - member($net->{adsl}{method}, qw(pppoe pptp)) and $net->{adsl}{ethernet_device} = $ntf_name; $net->{net_interface} = 'ppp0'; ($adsl_vpi, $adsl_vci) = (hex($net->{adsl}{vpi}), hex($net->{adsl}{vci})); }, @@ -788,8 +788,9 @@ If you do not know it, keep the preselected type."), ($net->{adsl}{vpi}, $net->{adsl}{vci}) = map { sprintf("%x", $_) } ($adsl_vpi, $adsl_vci); $net->{adsl}{device} = - $net->{adsl}{method} eq 'pptp' ? 'pptp_modem' : $net->{adsl}{method} eq 'capi' ? 'capi_modem' : + $net->{adsl}{method} eq 'pppoe' ? 'pppoe_modem' : + $net->{adsl}{method} eq 'pptp' ? 'pptp_modem' : $ntf_name; # FIXME: duplicate with $after_start_on_boot_step sub network::adsl::adsl_conf_backend($in, $modules_conf, $net); |