summaryrefslogtreecommitdiffstats
path: root/perl-install/install
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2012-12-11 10:03:38 +0000
committerThierry Vignaud <tv@mageia.org>2012-12-11 10:03:38 +0000
commit80e1e909eca5f1716afee90a7f9aef10bea60e7c (patch)
tree42b0cd26b185339d8eab573258364cdf0f875557 /perl-install/install
parentbbfe7dbf3cb724ab40861bdc6d82eb76a8b4062e (diff)
downloaddrakx-80e1e909eca5f1716afee90a7f9aef10bea60e7c.tar
drakx-80e1e909eca5f1716afee90a7f9aef10bea60e7c.tar.gz
drakx-80e1e909eca5f1716afee90a7f9aef10bea60e7c.tar.bz2
drakx-80e1e909eca5f1716afee90a7f9aef10bea60e7c.tar.xz
drakx-80e1e909eca5f1716afee90a7f9aef10bea60e7c.zip
(prep_net_suppl_media) adapt to install::media API change
thus fixing installing basesystem prior to adding a supplementary network medium
Diffstat (limited to 'perl-install/install')
-rw-r--r--perl-install/install/NEWS3
-rw-r--r--perl-install/install/any.pm5
2 files changed, 7 insertions, 1 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 2930f1e76..78bb26581 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,6 @@
+- fix installing basesystem prior to adding a supplementary network
+ medium
+
Version 15.7 - 10 December 2012
- media choice step:
diff --git a/perl-install/install/any.pm b/perl-install/install/any.pm
index af8de4647..939cc6776 100644
--- a/perl-install/install/any.pm
+++ b/perl-install/install/any.pm
@@ -148,7 +148,10 @@ sub prep_net_suppl_media {
$net_suppl_media_configured = 1;
# needed so that one can install basesystem before adding suppl network media:
- install::media::configure_media($o->{packages});
+ install::media::update_media($o->{packages});
+ require urpm::media;
+ urpm::media::configure($o->{packages});
+
#- install basesystem now
$o->do_pkgs->ensure_is_installed('basesystem', undef, 1);