diff options
| author | Thierry Vignaud <tv@mageia.org> | 2012-12-11 13:18:09 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mageia.org> | 2012-12-11 13:18:09 +0000 |
| commit | 1ca7631ecc7ad02c2576611e43927023de09de92 (patch) | |
| tree | 41f9717ea1656bdae418ace2a7ec91b94e5d9692 | |
| parent | 4418886a61d6f201223ce4ea9b79f329d4098c8b (diff) | |
| download | drakx-1ca7631ecc7ad02c2576611e43927023de09de92.tar drakx-1ca7631ecc7ad02c2576611e43927023de09de92.tar.gz drakx-1ca7631ecc7ad02c2576611e43927023de09de92.tar.bz2 drakx-1ca7631ecc7ad02c2576611e43927023de09de92.tar.xz drakx-1ca7631ecc7ad02c2576611e43927023de09de92.zip | |
(prep_net_suppl_media) fix network set up for adding network media if
not up by stage1 (aka DVD/CD case, mga#8282)
| -rw-r--r-- | perl-install/install/NEWS | 2 | ||||
| -rw-r--r-- | perl-install/install/any.pm | 2 |
2 files changed, 4 insertions, 0 deletions
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; |