summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordamien <damien@mandriva.com>2001-09-14 14:08:08 +0000
committerdamien <damien@mandriva.com>2001-09-14 14:08:08 +0000
commit2a11617dfbbd9ce2fc711072e1a242fc11ddef9a (patch)
tree00f312b98bedec669a7986ab516f0d31262c4b50
parent93c80ca0051d61fc474dfb8a7fefd842417549cb (diff)
downloaddrakx-backup-do-not-use-2a11617dfbbd9ce2fc711072e1a242fc11ddef9a.tar
drakx-backup-do-not-use-2a11617dfbbd9ce2fc711072e1a242fc11ddef9a.tar.gz
drakx-backup-do-not-use-2a11617dfbbd9ce2fc711072e1a242fc11ddef9a.tar.bz2
drakx-backup-do-not-use-2a11617dfbbd9ce2fc711072e1a242fc11ddef9a.tar.xz
drakx-backup-do-not-use-2a11617dfbbd9ce2fc711072e1a242fc11ddef9a.zip
updated speedtouch handling.
-rw-r--r--perl-install/network/adsl.pm10
1 files changed, 8 insertions, 2 deletions
diff --git a/perl-install/network/adsl.pm b/perl-install/network/adsl.pm
index f60deff05..3c6e7092d 100644
--- a/perl-install/network/adsl.pm
+++ b/perl-install/network/adsl.pm
@@ -137,10 +137,16 @@ user "$adsl->{login}"
['ppp-compress-24', 'ppp_deflate'],
['ppp-compress-26', 'ppp_deflate']);
$::isStandalone and modules::write_conf($prefix);
- $in->ask_warn('', _('You need the alcatel microcode.
+ my $mgmtrpm;
+ if($::isStandalone) {
+ $mgmtrpm = `grep speedtouch_mgmt /var/lib/urpmi/depslist.ordered` ? 1 : 0;
+ } else {
+ $mgmtrpm = pkgs::packageByName($in->{package}, "speedtouch_mgmt");
+ }
+ $mgmtrpm ? $in->do_pkgs->install('speedtouch_mgmt') : $in->ask_warn('', _('You need the alcatel microcode.
Download it at
http://www.alcatel.com/consumer/dsl/dvrreg_lx.htm
-and copy the mgmt.o in /usr/share/speedtouch'))
+and copy the mgmt.o in /usr/share/speedtouch'));
}
if ($adsl_type eq 'pptp') {