- the old $o->{keyboard} is now $o->{keyboard}{KEYBOARD}

- KBCHARSET is $o->{keyboard}{KBCHARSET}
- isNotDelete is $o->{keyboard}{BACKSPACE} (as written in sysconfig/keyboard)
- add GRP_TOGGLE which gives XkbOptions "grp:GRP_TOGGLE"
- add dialog box to choose GRP_TOGGLE

1 files changed, 5 insertions, 4 deletions

diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index 0010268cd..66e7f32b2 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -119,10 +119,11 @@ sub setupSCSI {
 #------------------------------------------------------------------------------
 sub selectKeyboard {
     my ($clicked, $first_time, $auto) = ($_[0], $_[1] == 1, $_[2]);
-
-    if ($o->{isUpgrade} && $first_time && $o->{keyboard_unsafe}) {
-	my $keyboard = keyboard::read($o->{prefix});
-	$keyboard and $o->{keyboard} = $keyboard;
+	    
+    if ($o->{isUpgrade} && $first_time && $o->{keyboard}{unsafe}) {
+	if (my $keyboard = keyboard::read($o->{prefix})) {
+	    $o->{keyboard} = $keyboard;
+	}
     }
     installStepsCall($o, $auto, 'selectKeyboard', $clicked);
 }