From e165b102f0ef444d33538434eb59befc800af4fc Mon Sep 17 00:00:00 2001
From: Olivier Blin <oblin@mandriva.org>
Date: Fri, 6 Aug 2004 05:16:00 +0000
Subject: try to load all modules that may be needed to establish connexion

---
 perl-install/network/adsl.pm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'perl-install/network')

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});
     }
 }
-- 
cgit v1.2.1