summaryrefslogtreecommitdiffstats
path: root/perl-install/install
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2009-03-26 15:52:34 +0000
committerThierry Vignaud <tv@mandriva.org>2009-03-26 15:52:34 +0000
commit42964756cd8a1241387e287d4c2024cafb903515 (patch)
tree7117f94b28d741699b755917bbcbf9f909914f65 /perl-install/install
parent8eceb41425f0f5ceb523e4b0918e3ba40295b83b (diff)
downloaddrakx-42964756cd8a1241387e287d4c2024cafb903515.tar
drakx-42964756cd8a1241387e287d4c2024cafb903515.tar.gz
drakx-42964756cd8a1241387e287d4c2024cafb903515.tar.bz2
drakx-42964756cd8a1241387e287d4c2024cafb903515.tar.xz
drakx-42964756cd8a1241387e287d4c2024cafb903515.zip
fix support for disk installation
Diffstat (limited to 'perl-install/install')
-rw-r--r--perl-install/install/NEWS1
-rw-r--r--perl-install/install/media.pm2
2 files changed, 2 insertions, 1 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 929f470da..0d5b462ba 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,6 +1,7 @@
- adjust partition size suggestion
o increase / size to 12GB (instead of 8)
o create separate /home starting at 13GB drives (instead of 7)
+- fix support for disk installation
- include & use urpmi translations
- when setting update media, make gurpmi.addmedia auto close instead
of waiting for user pressing "close" button on "media added with
diff --git a/perl-install/install/media.pm b/perl-install/install/media.pm
index e72014a25..15b9ffe57 100644
--- a/perl-install/install/media.pm
+++ b/perl-install/install/media.pm
@@ -502,7 +502,7 @@ 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' ? _get_medium_dir($phys_m) :
+ 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};