diff options
Diffstat (limited to 'perl-install')
| -rw-r--r-- | perl-install/install/NEWS | 3 | ||||
| -rw-r--r-- | perl-install/install/media.pm | 6 |
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 |