summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.org>2005-09-14 21:50:25 +0000
committerOlivier Blin <oblin@mandriva.org>2005-09-14 21:50:25 +0000
commit715da44d5e1ecf239982639258d1ea90fd35c612 (patch)
tree9670954dae60e2c7e137eb6e03725ccf2d14e452
parentd1d258a9f00c81d1dfd7dbc94bb2cdab0482d155 (diff)
downloaddrakx-backup-do-not-use-715da44d5e1ecf239982639258d1ea90fd35c612.tar
drakx-backup-do-not-use-715da44d5e1ecf239982639258d1ea90fd35c612.tar.gz
drakx-backup-do-not-use-715da44d5e1ecf239982639258d1ea90fd35c612.tar.bz2
drakx-backup-do-not-use-715da44d5e1ecf239982639258d1ea90fd35c612.tar.xz
drakx-backup-do-not-use-715da44d5e1ecf239982639258d1ea90fd35c612.zip
try to load all ppp modules, even if one of them fails
-rw-r--r--perl-install/network/adsl.pm5
1 files changed, 3 insertions, 2 deletions
diff --git a/perl-install/network/adsl.pm b/perl-install/network/adsl.pm
index 2c99c4224..77297f02c 100644
--- a/perl-install/network/adsl.pm
+++ b/perl-install/network/adsl.pm
@@ -323,8 +323,9 @@ user "$net->{adsl}{login}"
#- 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: $@");
+ foreach (@modules) {
+ eval { modules::load($_) } or log::l("failed to load $_ module: $@");
+ }
$modems{$adsl_device}{start} and run_program::rooted($::prefix, $modems{$adsl_device}{start});
}