summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2009-03-09 14:01:33 +0000
committerThierry Vignaud <tv@mandriva.org>2009-03-09 14:01:33 +0000
commitb176b08ce8a478dd3e343d4dc6c8ae6660c50e28 (patch)
tree53df78bb20051d53bd4cdc2481d41a323f27e23a /perl-install
parent3312243c498d663768e28ed9718881d6d8a5ad7e (diff)
downloaddrakx-b176b08ce8a478dd3e343d4dc6c8ae6660c50e28.tar
drakx-b176b08ce8a478dd3e343d4dc6c8ae6660c50e28.tar.gz
drakx-b176b08ce8a478dd3e343d4dc6c8ae6660c50e28.tar.bz2
drakx-b176b08ce8a478dd3e343d4dc6c8ae6660c50e28.tar.xz
drakx-b176b08ce8a478dd3e343d4dc6c8ae6660c50e28.zip
(get_media) fix accessing CD-ROM based media on x86_64
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/install/NEWS2
-rw-r--r--perl-install/install/media.pm2
2 files changed, 3 insertions, 1 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 4c3e1eefd..45555e70c 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,5 @@
+- fix accessing CD-ROM based media on x86_64
+
Version 12.10 - 9 March 2009
- fix CD-ROM based media path for post-installation usage (for 32bit)
diff --git a/perl-install/install/media.pm b/perl-install/install/media.pm
index 21a85cfdb..2e8d617d7 100644
--- a/perl-install/install/media.pm
+++ b/perl-install/install/media.pm
@@ -503,7 +503,7 @@ sub get_media {
|| $phys_m->{real_mntpoint} || $phys_m->{url};
# adjust URI for cdroms if needed:
if ($o->{stage2_phys_medium}{method} eq 'cdrom') {
- $uri .= "/" . $MDK::Common::System::compat_arch{arch()};
+ $uri .= "/" . ($arch =~ /i.86/ ? $MDK::Common::System::compat_arch{arch()} : arch());
system('cp', "$uri/media/media_info/compssUsers.pl", '/tmp/compssUsers.pl');
} else {
_get_compsUsers_pl($phys_m, $_->{force_rpmsrate});