From e7c04a3927728ab17105616f4d03ee3c00c425c4 Mon Sep 17 00:00:00 2001
From: Olivier Blin <oblin@mandriva.org>
Date: Wed, 4 Aug 2004 14:19:43 +0000
Subject: add modules arrays and use modules::load to be able to load modules
 from modules.cz files, load these modules when not in standalone mode
 (they're needed for install and Move)

---
 perl-install/network/adsl.pm | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

(limited to 'perl-install/network/adsl.pm')

diff --git a/perl-install/network/adsl.pm b/perl-install/network/adsl.pm
index 9e1e4fecb..3869ffe08 100644
--- a/perl-install/network/adsl.pm
+++ b/perl-install/network/adsl.pm
@@ -137,10 +137,8 @@ sync
 
                   speedtouch =>
                   {
-                   start => qq(
-modprobe speedtch
-/usr/bin/speedtouch-start
-),
+                   modules => [ qw(speedtch) ],
+                   start => '/usr/bin/speedtouch-start',
                    overide_script => 1,
                    server => {
                               pppoa => qq("/usr/sbin/pppoa3 -c")
@@ -163,10 +161,8 @@ noaccomp),
                   },
                   sagem =>
                   {
-                   start => qq(
-modprobe eagle-usb
-/usr/sbin/eaglectrl -d
-),
+                   modules => [ qw(eagle-usb) ],
+                   start => '/usr/sbin/eaglectrl -d',
                    stop =>  "/usr/bin/killall pppoa",
                    get_intf => "/usr/sbin/eaglectrl -i",
                    server => {
@@ -321,7 +317,10 @@ TYPE=$kind
     $netc->{NET_INTERFACE} = 'ppp0';
     write_cnx_script($netc);
 
-    $::isInstall && $modems{$adsl_device}{start} and run_program::rooted($::prefix, $modems{$adsl_device}{start});
+    unless ($::isStandalone) {
+        $modems{$adsl_device}{modules} and modules::load(@{$modems{$adsl_device}{modules}});
+        $modems{$adsl_device}{start} and run_program::rooted($::prefix, $modems{$adsl_device}{start});
+    }
 }
 
 1;
-- 
cgit v1.2.1