summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.com>2009-11-30 14:27:39 +0000
committerOlivier Blin <oblin@mandriva.com>2009-11-30 14:27:39 +0000
commitfb244376d0399f54b303f6fb24b1018afa84526f (patch)
treeddda8c05b1cc6a9bc6aff37c22259834038ed471
parent9e0231cfae73af92d0c6ff78e7c91146aab6a71d (diff)
downloaddrakx-fb244376d0399f54b303f6fb24b1018afa84526f.tar
drakx-fb244376d0399f54b303f6fb24b1018afa84526f.tar.gz
drakx-fb244376d0399f54b303f6fb24b1018afa84526f.tar.bz2
drakx-fb244376d0399f54b303f6fb24b1018afa84526f.tar.xz
drakx-fb244376d0399f54b303f6fb24b1018afa84526f.zip
fix adding additional media with type media_cfg (for auto_install)
-rw-r--r--perl-install/install/NEWS1
-rw-r--r--perl-install/install/media.pm1
2 files changed, 2 insertions, 0 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 42cf8ed51..c2975ec5d 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -13,6 +13,7 @@
(workaround urpmi bug)
- bootloader:
o do not add removable drives as "Windows" entry in bootloader
+- fix adding additional media with type media_cfg (for auto_install)
Version 12.77 - 30 October 2009
diff --git a/perl-install/install/media.pm b/perl-install/install/media.pm
index da8becd7f..6e555fd7b 100644
--- a/perl-install/install/media.pm
+++ b/perl-install/install/media.pm
@@ -503,6 +503,7 @@ sub get_media {
foreach (@$media) {
if ($_->{type} eq 'media_cfg') {
$phys_m = url2mounted_phys_medium($o, $_->{url}, 'media_info');
+ local $phys_m->{is_suppl} = $_->{url} ne "drakx://media"; # so that _get_media_url() works
($suppl_CDs, $copy_rpms_on_disk) = get_media_cfg($o, $phys_m, $packages, $_->{selected_names}, $_->{force_rpmsrate});
} elsif ($_->{type} eq 'media') {
$phys_m = url2mounted_phys_medium($o, $_->{url});