summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>1999-10-13 15:37:20 +0000
committerFrancois Pons <fpons@mandriva.com>1999-10-13 15:37:20 +0000
commit7afaa567f5059510ecdea266b67679810a81bf0b (patch)
tree10428a316107ecabbe1a1d2e088615fe2c6d6828
parentebe64ad2cfa3612cc535f8a9f192090a8555b738 (diff)
downloaddrakx-7afaa567f5059510ecdea266b67679810a81bf0b.tar
drakx-7afaa567f5059510ecdea266b67679810a81bf0b.tar.gz
drakx-7afaa567f5059510ecdea266b67679810a81bf0b.tar.bz2
drakx-7afaa567f5059510ecdea266b67679810a81bf0b.tar.xz
drakx-7afaa567f5059510ecdea266b67679810a81bf0b.zip
*** empty log message ***
-rw-r--r--perl-install/install2.pm2
-rw-r--r--perl-install/install_steps.pm7
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($) {