From 50e6c0f79824b395dc6f517cc2a9d3b2d5d1a71f Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Mon, 30 Mar 2009 11:11:23 +0000 Subject: (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) --- perl-install/install/media.pm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'perl-install/install/media.pm') 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))) { -- cgit v1.2.1