diff options
| author | Thierry Vignaud <tv@mandriva.org> | 2009-03-30 11:11:23 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mandriva.org> | 2009-03-30 11:11:23 +0000 |
| commit | 50e6c0f79824b395dc6f517cc2a9d3b2d5d1a71f (patch) | |
| tree | 14dfe98163e3d92ca222bb7d96a6b395326e495f | |
| parent | d3b971f8089f828beadf8a952a664c4aec4cb813 (diff) | |
| download | drakx-50e6c0f79824b395dc6f517cc2a9d3b2d5d1a71f.tar drakx-50e6c0f79824b395dc6f517cc2a9d3b2d5d1a71f.tar.gz drakx-50e6c0f79824b395dc6f517cc2a9d3b2d5d1a71f.tar.bz2 drakx-50e6c0f79824b395dc6f517cc2a9d3b2d5d1a71f.tar.xz drakx-50e6c0f79824b395dc6f517cc2a9d3b2d5d1a71f.zip | |
(get_media) always trust stage1's /tmp/image (thus fixing ISO on NFS
installation as well as NFS installation from cooker/ instead of eg
cooker/i586 (#48874)
| -rw-r--r-- | perl-install/install/NEWS | 3 | ||||
| -rw-r--r-- | perl-install/install/media.pm | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index 96a69b97e..7d7a6bd0b 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,3 +1,6 @@ +- media management: + o always trust stage1 (fix ISO on NFS installation as well as NFS + installation from cooker/ instead of eg cooker/i586 (#48874) - update list of filesystems not handling bad blocks checking - display label of partitions in the graphical view when no mountpoint is set diff --git a/perl-install/install/media.pm b/perl-install/install/media.pm index 15b9ffe57..bde8c98f0 100644 --- a/perl-install/install/media.pm +++ b/perl-install/install/media.pm @@ -502,10 +502,8 @@ sub get_media { $phys_m = url2mounted_phys_medium($o, $_->{url}, 'media_info'); log::l(Data::Dumper->Dump([ $phys_m ], [ 'phys_m' ])); log::l(Data::Dumper->Dump([ $o->{stage2_phys_medium} ], [ 'stage2_phys_medium' ])); - my $uri = $o->{stage2_phys_medium}{method} eq 'disk' ? '/tmp/image' : - $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}; + my $uri = $o->{stage2_phys_medium}{url} =~ m!^(http|ftp)://! && $o->{stage2_phys_medium}{url} || + $phys_m->{method} =~ m!^(ftp|http)://! && $phys_m->{method} || '/tmp/image'; # adjust URI for cdroms if needed: if (member($o->{stage2_phys_medium}{method}, qw(iso cdrom))) { |