diff options
| author | Martin Whitaker <mageia@martin-whitaker.me.uk> | 2018-01-07 21:17:11 +0000 |
|---|---|---|
| committer | Martin Whitaker <mageia@martin-whitaker.me.uk> | 2018-05-28 11:53:57 +0100 |
| commit | 767dffd176a6c96733adbb557f74e9779ea3b927 (patch) | |
| tree | ec603613dd3d0a04ee80637a01f6c9ddacbd58a9 | |
| parent | 766595347989ed34921b8738c13977b81125162b (diff) | |
| download | drakx-767dffd176a6c96733adbb557f74e9779ea3b927.tar drakx-767dffd176a6c96733adbb557f74e9779ea3b927.tar.gz drakx-767dffd176a6c96733adbb557f74e9779ea3b927.tar.bz2 drakx-767dffd176a6c96733adbb557f74e9779ea3b927.tar.xz drakx-767dffd176a6c96733adbb557f74e9779ea3b927.zip | |
installer: support ChooseMedia in auto-install interactiveSteps.
(cherry picked from commit 2115499188dc5fd75370ce389382ae51ef3eb5b6)
| -rw-r--r-- | perl-install/install/any.pm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/perl-install/install/any.pm b/perl-install/install/any.pm index 8eb0d91a1..c2bc4c909 100644 --- a/perl-install/install/any.pm +++ b/perl-install/install/any.pm @@ -588,7 +588,7 @@ sub setPackages { $medium->{temp_enabled} = member($medium->{name}, @{$o->{enabled_media}}); } } - media_screen($o) if !$::auto_install && !$::o->{match_all_hardware}; + media_screen($o) if !$::auto_install || member('chooseMedia', @{$::o->{interactiveSteps}}); enable_choosen_media($o); my @choosen_media = map { $_->{name} } grep { !$_->{ignore} } @{$urpm->{media}}; log::l("choosen media: ", join(', ', @choosen_media)); |