diff options
| -rw-r--r-- | perl-install/install2.pm | 2 | ||||
| -rw-r--r-- | perl-install/install_steps.pm | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/perl-install/install2.pm b/perl-install/install2.pm index 0d9d59783..2430b977f 100644 --- a/perl-install/install2.pm +++ b/perl-install/install2.pm @@ -227,7 +227,7 @@ sub selectKeyboard { return unless $o->{isUpgrade} || !$::beginner || $clicked; - $o->{keyboard} = (keyboard::read($o->{prefix}))[0] if $o->{isUpgrade} && !$clicked && !$o->{keyboard}; + $o->{keyboard} = (keyboard::read($o->{prefix}))[0] if $o->{isUpgrade} && !$clicked && !$o->{keyboard_force}; $o->selectKeyboard if !$::beginner || $clicked; #- if we go back to the selectKeyboard, you must rewrite diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm index 8188fa87f..6794899f7 100644 --- a/perl-install/install_steps.pm +++ b/perl-install/install_steps.pm @@ -181,8 +181,11 @@ sub beforeInstallPackages { sub installPackages($$) { my ($o, $packages) = @_; - my $toInstall = [ grep { $_->{selected} && !$_->{installed} } values %$packages ]; - pkgs::install($o->{prefix}, $toInstall); + #- my $toInstall = [ grep { $_->{selected} && !$_->{installed} } values %$packages ]; + my @toInstall = $packages->{basesystem}{selected} && !$packages->{basesystem}{installed} ? ($packages->{basesystem}) : (); + push @toInstall, grep { $_->{base} && $_->{selected} && !$_->{installed} } values %$packages; + push @toInstall, grep { !$_->{base} && $_->{selected} && !$_->{installed} } values %$packages; + pkgs::install($o->{prefix}, \@toInstall); } sub afterInstallPackages($) { |