diff options
| -rw-r--r-- | perl-install/install2.pm | 21 |
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); } #------------------------------------------------------------------------------ |