summaryrefslogtreecommitdiffstats
path: root/perl-install/network
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.org>2004-08-06 05:16:00 +0000
committerOlivier Blin <oblin@mandriva.org>2004-08-06 05:16:00 +0000
commite165b102f0ef444d33538434eb59befc800af4fc (patch)
tree5b0207dada3c2cd66f198d83f498b78f684bfab3 /perl-install/network
parenta826e9b683ee7580c28320bd398d974697abd74d (diff)
downloaddrakx-e165b102f0ef444d33538434eb59befc800af4fc.tar
drakx-e165b102f0ef444d33538434eb59befc800af4fc.tar.gz
drakx-e165b102f0ef444d33538434eb59befc800af4fc.tar.bz2
drakx-e165b102f0ef444d33538434eb59befc800af4fc.tar.xz
drakx-e165b102f0ef444d33538434eb59befc800af4fc.zip
try to load all modules that may be needed to establish connexion
Diffstat (limited to 'perl-install/network')
-rw-r--r--perl-install/network/adsl.pm6
1 files changed, 4 insertions, 2 deletions
diff --git a/perl-install/network/adsl.pm b/perl-install/network/adsl.pm
index c14b3bb13..47925dce8 100644
--- a/perl-install/network/adsl.pm
+++ b/perl-install/network/adsl.pm
@@ -318,13 +318,15 @@ TYPE=$kind
write_cnx_script($netc);
unless ($::isStandalone) {
+ #- proc and usbdevfs need to be mounted for external start commands
$::isInstall && eval {
require fs;
fs::mount("/proc", "$::prefix/proc", 'proc') if !-f "$::prefix/proc/mounts";
fs::mount("/proc/bus/usb", "$::prefix/proc/bus/usb", 'usbdevfs');
} or log::l("failed to mount usbdevfs");
- $modems{$adsl_device}{modules} && eval { modules::load(@{$modems{$adsl_device}{modules}}) }
- or log::l("failed to load " . join('', @{$modems{$adsl_device}{modules}}), " modules: $@");
+ my @modules = (@{$modems{$adsl_device}{modules}}, map { $_->[1] } @{$modems{$adsl_device}{aliases}});
+ @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});
}
}