From 3a4d344290dc77157b59206af3f3ceb9071bb210 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Tue, 11 Dec 2012 13:18:09 +0000 Subject: (prep_net_suppl_media) fix network set up for adding network media if not up by stage1 (aka DVD/CD case, mga#8282) --- perl-install/install/NEWS | 2 ++ perl-install/install/any.pm | 2 ++ 2 files changed, 4 insertions(+) diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index fb69e5e5b..2346ff88a 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,3 +1,5 @@ +- fix network set up for adding network media if not up by stage1 + (aka DVD/CD case, mga#8282) - partitionning: o if a partition has been manually formated, don't offer to format it again (mga#7822) diff --git a/perl-install/install/any.pm b/perl-install/install/any.pm index d6949de07..f280506fc 100644 --- a/perl-install/install/any.pm +++ b/perl-install/install/any.pm @@ -155,6 +155,8 @@ sub prep_net_suppl_media { #- install basesystem now $o->do_pkgs->ensure_is_installed('basesystem', undef, 1); + # in case of no network install: + $o->{net} ||= {}; require network::netconnect; network::netconnect::real_main($o->{net}, $o, $o->{modules_conf}); require install::interactive; -- cgit v1.2.1