From 57478ce19b04e9db2ab184501a5b928c9b2055d9 Mon Sep 17 00:00:00 2001
From: Francois Pons <fpons@mandriva.com>
Date: Tue, 28 Nov 2000 10:42:13 +0000
Subject: change upgrade section for keyboard.

---
 perl-install/install2.pm | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'perl-install/install2.pm')

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
-- 
cgit v1.2.1