summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.org>2004-08-04 14:19:43 +0000
committerOlivier Blin <oblin@mandriva.org>2004-08-04 14:19:43 +0000
commite7c04a3927728ab17105616f4d03ee3c00c425c4 (patch)
tree50de3ac8fc2963fe8ae004d844aaaa9c4c5ec80b
parentbbf9708686d5ca8bea1352ec3c5e32ed5595dd9c (diff)
downloaddrakx-e7c04a3927728ab17105616f4d03ee3c00c425c4.tar
drakx-e7c04a3927728ab17105616f4d03ee3c00c425c4.tar.gz
drakx-e7c04a3927728ab17105616f4d03ee3c00c425c4.tar.bz2
drakx-e7c04a3927728ab17105616f4d03ee3c00c425c4.tar.xz
drakx-e7c04a3927728ab17105616f4d03ee3c00c425c4.zip
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)
-rw-r--r--perl-install/network/adsl.pm17
1 files changed, 8 insertions, 9 deletions
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;