From b176b08ce8a478dd3e343d4dc6c8ae6660c50e28 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mandriva.org>
Date: Mon, 9 Mar 2009 14:01:33 +0000
Subject: (get_media) fix accessing CD-ROM based media on x86_64

---
 perl-install/install/NEWS     | 2 ++
 perl-install/install/media.pm | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

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});
-- 
cgit v1.2.1