summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2005-09-15 11:03:39 +0000
committerPascal Rigaux <pixel@mandriva.com>2005-09-15 11:03:39 +0000
commit28e12dd540cdc89f93b6a2cc1e0dacfbec120ba6 (patch)
tree4b93f2a397ba52679f0ce2637544903ab96123ac /perl-install
parente6efbc9809f5a02c9389f7cf05c695f41933b107 (diff)
downloaddrakx-28e12dd540cdc89f93b6a2cc1e0dacfbec120ba6.tar
drakx-28e12dd540cdc89f93b6a2cc1e0dacfbec120ba6.tar.gz
drakx-28e12dd540cdc89f93b6a2cc1e0dacfbec120ba6.tar.bz2
drakx-28e12dd540cdc89f93b6a2cc1e0dacfbec120ba6.tar.xz
drakx-28e12dd540cdc89f93b6a2cc1e0dacfbec120ba6.zip
since choosing keyboard is done after mounting partition to upgrade,
we can do things much more nicely on upgrade: - keeping previous keyboard - or forcing prompting keyboard when bad keyboard
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/install2.pm21
1 files changed, 9 insertions, 12 deletions
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index 259dc1e3b..599e7ffb7 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -122,18 +122,15 @@ sub setupSCSI {
sub selectKeyboard {
my ($auto) = @_;
- installStepsCall($o, $auto, 'selectKeyboard');
-
- #- read keyboard ASAP (so that summary displays ok)
- addToBeDone {
- $o->{keyboard}{unsafe} or return;
- if (my $keyboard = keyboard::read()) {
- $o->{keyboard} = $keyboard;
- } elsif ($o->{isUpgrade}) {
- #- oops, the keyboard config is wrong, writing the unsafe config
- addToBeDone { keyboard::write($o->{keyboard}) } 'installPackages';
- }
- } 'formatPartitions';
+ my $force;
+ if (my $keyboard = keyboard::read()) {
+ $o->{keyboard} = $keyboard; #- for uprade
+ } elsif ($o->{isUpgrade}) {
+ #- oops, the keyboard config is wrong, forcing prompt and writing
+ $force = 1;
+ }
+
+ installStepsCall($o, $auto, 'selectKeyboard', $force);
}
#------------------------------------------------------------------------------