summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2009-03-17 17:13:15 +0000
committerThierry Vignaud <tv@mandriva.org>2009-03-17 17:13:15 +0000
commitd28d5040878ad7ad417b76f92684d35dd4c3af79 (patch)
tree4e707b21b1cd4b92b78172cb22dfff320b7d4f4c
parent826c00452a11ec5aebd5d945d3425bb16d0c13e9 (diff)
downloaddrakx-d28d5040878ad7ad417b76f92684d35dd4c3af79.tar
drakx-d28d5040878ad7ad417b76f92684d35dd4c3af79.tar.gz
drakx-d28d5040878ad7ad417b76f92684d35dd4c3af79.tar.bz2
drakx-d28d5040878ad7ad417b76f92684d35dd4c3af79.tar.xz
drakx-d28d5040878ad7ad417b76f92684d35dd4c3af79.zip
(get_media) fix support for iso-on-disk installation (regression when
installer switched to urpmi) (#48661)
-rw-r--r--perl-install/install/NEWS3
-rw-r--r--perl-install/install/media.pm6
2 files changed, 7 insertions, 2 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 3637055c6..6dc82b6b5 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,6 @@
+- fix support for iso-on-disk installation
+ (regression when installer switched to urpmi)
+
Version 12.14 - 11 March 2009
- fix displaying help (same webkit regression that affected mcc (#47840))
diff --git a/perl-install/install/media.pm b/perl-install/install/media.pm
index 2ca7b1a8d..a01861f05 100644
--- a/perl-install/install/media.pm
+++ b/perl-install/install/media.pm
@@ -498,11 +498,13 @@ sub get_media {
foreach (@$media) {
if ($_->{type} eq 'media_cfg') {
$phys_m = url2mounted_phys_medium($o, $_->{url}, 'media_info');
- my $uri = $o->{stage2_phys_medium}{url} =~ m!^(http|ftp)://! && $o->{stage2_phys_medium}{url} ||
+ my $uri = $o->{stage2_phys_medium}{method} eq 'disk' ? _get_medium_dir($phys_m) :
+ $o->{stage2_phys_medium}{url} =~ m!^(http|ftp)://! && $o->{stage2_phys_medium}{url} ||
$phys_m->{method} =~ m!^(ftp|http)://! && $phys_m->{method}
|| $phys_m->{real_mntpoint} || $phys_m->{url};
+
# adjust URI for cdroms if needed:
- if ($o->{stage2_phys_medium}{method} eq 'cdrom') {
+ if (member($o->{stage2_phys_medium}{method}, qw(iso cdrom))) {
my $arch = arch();
$uri .= "/" . ($arch =~ /i.86/ ? $MDK::Common::System::compat_arch{arch()} : arch());
# FIXME: investigate why _get_compsUsers_pl($phys_m, $_->{force_rpmsrate}) didn't worked:o