summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2000-11-28 10:42:13 +0000
committerFrancois Pons <fpons@mandriva.com>2000-11-28 10:42:13 +0000
commit57478ce19b04e9db2ab184501a5b928c9b2055d9 (patch)
tree5dd3c8b2ba4c6bb5ccb10c141800130df39f5784
parente4a73c3f60d9809988d147a11d3a48b5626ee1b5 (diff)
downloaddrakx-57478ce19b04e9db2ab184501a5b928c9b2055d9.tar
drakx-57478ce19b04e9db2ab184501a5b928c9b2055d9.tar.gz
drakx-57478ce19b04e9db2ab184501a5b928c9b2055d9.tar.bz2
drakx-57478ce19b04e9db2ab184501a5b928c9b2055d9.tar.xz
drakx-57478ce19b04e9db2ab184501a5b928c9b2055d9.zip
change upgrade section for keyboard.
-rw-r--r--perl-install/install2.pm9
1 files changed, 6 insertions, 3 deletions
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index a0b3f06c7..d6e172911 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -228,11 +228,14 @@ sub setupSCSI {
#------------------------------------------------------------------------------
sub selectKeyboard {
- my ($clicked) = @_;
+ my ($clicked, $first_time) = ($_[0], $_[1] == 1);
- return if !$o->{isUpgrade} && $::beginner && !$clicked;
+ if ($o->{isUpgrade} && $first_time && $o->{keyboard_unsafe}) {
+ my $keyboard = keyboard::read($o->{prefix});
+ $keyboard and $o->{keyboard} = $keyboard;
+ }
+ return if $::beginner && !$clicked;
- $o->{keyboard} = keyboard::read($o->{prefix}) if $o->{isUpgrade} && !$clicked && $o->{keyboard_unsafe};
$o->selectKeyboard;
#- if we go back to the selectKeyboard, you must rewrite