summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--perl-install/network/adsl.pm4
1 files changed, 3 insertions, 1 deletions
diff --git a/perl-install/network/adsl.pm b/perl-install/network/adsl.pm
index 4c0a62dd4..2c99c4224 100644
--- a/perl-install/network/adsl.pm
+++ b/perl-install/network/adsl.pm
@@ -92,7 +92,6 @@ sub adsl_conf_backend {
bewan =>
{
start => qq(
-modprobe pppoatm
# ActivationMode=1
modprobe $bewan_module
# wait for the modem to be set up:
@@ -321,6 +320,9 @@ user "$net->{adsl}{login}"
#- useful during install, or in case the packages have been installed after the device has been plugged
my @modules = (@{$modems{$adsl_device}{modules}}, map { $_->[1] } @{$modems{$adsl_device}{aliases}});
@modules or @modules = qw(ppp_synctty ppp_async ppp_generic n_hdlc); #- required for pppoe/pptp connections
+ #- pppoa connections need the pppoatm module
+ #- pppd should run "modprobe pppoatm", but it will fail during install
+ push @modules, 'pppoatm' if $adsl_type = 'pppoa';
@modules && eval { modules::load(@modules) }
or log::l("failed to load " . join(',', @modules), " modules: $@");
$modems{$adsl_device}{start} and run_program::rooted($::prefix, $modems{$adsl_device}{start});