summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorDamien Chaumette <dchaumette@mandriva.com>2003-09-16 14:16:56 +0000
committerDamien Chaumette <dchaumette@mandriva.com>2003-09-16 14:16:56 +0000
commitdb7addb9a86f475e784671102ba4eebb8c18bd04 (patch)
treef0372d7a2ba93fec260cf890a3c9b99851f475e4 /perl-install
parente99a8f018c8118a5f6d6470b6fd2e7c53e804b5a (diff)
downloaddrakx-db7addb9a86f475e784671102ba4eebb8c18bd04.tar
drakx-db7addb9a86f475e784671102ba4eebb8c18bd04.tar.gz
drakx-db7addb9a86f475e784671102ba4eebb8c18bd04.tar.bz2
drakx-db7addb9a86f475e784671102ba4eebb8c18bd04.tar.xz
drakx-db7addb9a86f475e784671102ba4eebb8c18bd04.zip
fix firmware testing at installation
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/network/adsl.pm4
1 files changed, 2 insertions, 2 deletions
diff --git a/perl-install/network/adsl.pm b/perl-install/network/adsl.pm
index 9844b2b64..372504570 100644
--- a/perl-install/network/adsl.pm
+++ b/perl-install/network/adsl.pm
@@ -208,7 +208,7 @@ user "$adsl->{login}"
['ppp-compress-26', 'ppp_deflate'];
$::isStandalone and modules::write_conf($prefix);
$in->do_pkgs->what_provides("speedtouch_mgmt") and $in->do_pkgs->install('speedtouch_mgmt');
- -e "/usr/share/speedtouch/mgmt.o" and return 1;
+ -e "$prefix/usr/share/speedtouch/mgmt.o" and return 1;
firmware:
@@ -222,7 +222,7 @@ user "$adsl->{login}"
You can provide it now via a floppy or your windows partition,
or skip and do it later."), $l) or return;
- my $destination = '/usr/share/speedtouch/';
+ my $destination = "$prefix/usr/share/speedtouch/";
$answer eq 'Use a floppy' and network::tools::copy_firmware('floppy', $destination, 'mgmt.o') || goto firmware;
$answer eq 'Use my Windows partition' and network::tools::copy_firmware('windows', $destination, 'alcaudsl.sys') || goto firmware;
$answer eq 'Do it later' and $in->ask_warn('', N("You need the Alcatel microcode.