From 099347f5ca7728915eca230c3f7cd83a1216e399 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mandriva.org>
Date: Wed, 8 Apr 2009 14:52:28 +0000
Subject: (_get_media_url) handle NFS & CDROM media with arched directory (aka
 'i586/')

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

(limited to 'perl-install/install')

diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 73510958f..fd3a5ffef 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,6 @@
+- media management:
+  o handle NFS & CDROM media with arched directory (aka 'i586/')
+
 Version 12.26 - 08 April 2009
 
 - include vmmouse driver (#49654)
diff --git a/perl-install/install/media.pm b/perl-install/install/media.pm
index ee2bfbebf..e562af605 100644
--- a/perl-install/install/media.pm
+++ b/perl-install/install/media.pm
@@ -635,8 +635,10 @@ sub _get_media_url {
         if (member($phys_medium->{method}, qw(ftp http))) {
             $uri = $phys_medium->{url};
             $uri =~ s!/media$!!;
-        } elsif ($phys_medium->{method} eq 'nfs') {
+        } elsif (member($phys_medium->{method}, qw(cdrom nfs))) {
             $uri = "$::prefix/$phys_medium->{mntpoint}";
+            my $arch = arch() =~ /i.86/ ? $MDK::Common::System::compat_arch{arch()} : arch();
+            $uri .= "/$arch" if -d "$uri/$arch";
         }
     } else {
         $uri = $o->{stage2_phys_medium}{url} =~ m!^(http|ftp)://! && $o->{stage2_phys_medium}{url} ||
-- 
cgit v1.2.1