summaryrefslogtreecommitdiffstats
path: root/perl-install/install2.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2002-08-01 21:25:55 +0000
committerPascal Rigaux <pixel@mandriva.com>2002-08-01 21:25:55 +0000
commitb60b957d3a8821b7f1afb298e40809d58deb3c9c (patch)
tree2a95fbdb96d12ba681ff623f059799fd6e7d5418 /perl-install/install2.pm
parent6f91f1c65c6afc807f87b6a4a20ae19776cd8a65 (diff)
downloaddrakx-b60b957d3a8821b7f1afb298e40809d58deb3c9c.tar
drakx-b60b957d3a8821b7f1afb298e40809d58deb3c9c.tar.gz
drakx-b60b957d3a8821b7f1afb298e40809d58deb3c9c.tar.bz2
drakx-b60b957d3a8821b7f1afb298e40809d58deb3c9c.tar.xz
drakx-b60b957d3a8821b7f1afb298e40809d58deb3c9c.zip
- 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
Diffstat (limited to 'perl-install/install2.pm')
-rw-r--r--perl-install/install2.pm9
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);
}