summaryrefslogtreecommitdiffstats
path: root/perl-install/install
diff options
context:
space:
mode:
authorMartin Whitaker <mageia@martin-whitaker.me.uk>2018-01-07 21:17:11 +0000
committerMartin Whitaker <mageia@martin-whitaker.me.uk>2018-03-12 20:07:11 +0000
commit2115499188dc5fd75370ce389382ae51ef3eb5b6 (patch)
tree63b8630e667c4e72009f28f72edca7d495bbb097 /perl-install/install
parente33954fa648955dc42a203f24096b924fd5a0bb6 (diff)
downloaddrakx-2115499188dc5fd75370ce389382ae51ef3eb5b6.tar
drakx-2115499188dc5fd75370ce389382ae51ef3eb5b6.tar.gz
drakx-2115499188dc5fd75370ce389382ae51ef3eb5b6.tar.bz2
drakx-2115499188dc5fd75370ce389382ae51ef3eb5b6.tar.xz
drakx-2115499188dc5fd75370ce389382ae51ef3eb5b6.zip
installer: support ChooseMedia in auto-install interactiveSteps.
Diffstat (limited to 'perl-install/install')
-rw-r--r--perl-install/install/any.pm2
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));