diff options
| -rw-r--r-- | perl-install/install/NEWS | 2 | ||||
| -rw-r--r-- | perl-install/install/steps_interactive.pm | 13 |
2 files changed, 9 insertions, 6 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index 9821a8d78..a4537dcb5 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,3 +1,5 @@ +- don't show hardware in summary screen when match_all_hardware flag is set + Version 18.29 - 6 June 2020 - partitioning: exclude ISO installer medium from available disks (mga#26714) diff --git a/perl-install/install/steps_interactive.pm b/perl-install/install/steps_interactive.pm index fc4042279..52b8b786d 100644 --- a/perl-install/install/steps_interactive.pm +++ b/perl-install/install/steps_interactive.pm @@ -920,17 +920,17 @@ sub summary { label => N("Keyboard"), val => sub { $o->{keyboard} && translate(keyboard::keyboard2text($o->{keyboard})) }, clicked => sub { $o->selectKeyboard(1) }, - }; + } if !$o->{match_all_hardware}; push @l, { group => N("Hardware"), label => N("Mouse"), val => sub { translate($o->{mouse}{type}) . ' ' . translate($o->{mouse}{name}) }, clicked => sub { selectMouse($o, 1); mouse::write($o->do_pkgs, $o->{mouse}) }, - }; + } if !$o->{match_all_hardware}; - my @sound_cards = detect_devices::getSoundDevices(); + my @sound_cards = $o->{match_all_hardware} ? () : detect_devices::getSoundDevices(); my $sound_index = 0; foreach my $device (@sound_cards) { @@ -954,7 +954,7 @@ sub summary { label => N("Graphical interface"), val => sub { $o->{raw_X} ? Xconfig::various::to_string($o->{raw_X}) : '' }, clicked => sub { configureX($o, 'expert') }, - }; + } if !$o->{match_all_hardware}; push @l, { group => N("Network & Internet"), @@ -965,7 +965,7 @@ sub summary { require network::netconnect; network::netconnect::real_main($o->{net}, $o, $o->{modules_conf}); }, - }; + } if !$o->{match_all_hardware}; $o->{miscellaneous} ||= {}; push @l, { @@ -977,7 +977,7 @@ sub summary { network::network::miscellaneous_choose($o, $o->{miscellaneous}); network::network::proxy_configure($o->{miscellaneous}) if !$::testing; }, - }; + } if !$o->{match_all_hardware}; push @l, { group => N("Security"), @@ -1016,6 +1016,7 @@ sub summary { } if detect_devices::get_net_interfaces(); my $check_complete = sub { + return 1 if $o->{match_all_hardware}; require install::pkgs; my $p = install::pkgs::packageByName($o->{packages}, 'task-x11'); $o->{raw_X} || !$::testing && $p && !$p->flag_installed || |