diff options
| author | Thierry Vignaud <tv@mandriva.org> | 2009-04-08 14:52:28 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mandriva.org> | 2009-04-08 14:52:28 +0000 |
| commit | 099347f5ca7728915eca230c3f7cd83a1216e399 (patch) | |
| tree | 46c990812d1a051afaa1ce54cd5d114e39ee1881 | |
| parent | 8c8d8c9c9ca74bcc24b248dd3790a94a9fef98f9 (diff) | |
| download | drakx-099347f5ca7728915eca230c3f7cd83a1216e399.tar drakx-099347f5ca7728915eca230c3f7cd83a1216e399.tar.gz drakx-099347f5ca7728915eca230c3f7cd83a1216e399.tar.bz2 drakx-099347f5ca7728915eca230c3f7cd83a1216e399.tar.xz drakx-099347f5ca7728915eca230c3f7cd83a1216e399.zip | |
(_get_media_url) handle NFS & CDROM media with arched directory (aka 'i586/')
| -rw-r--r-- | perl-install/install/NEWS | 3 | ||||
| -rw-r--r-- | perl-install/install/media.pm | 4 |
2 files changed, 6 insertions, 1 deletions
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} || |