summaryrefslogtreecommitdiffstats
path: root/perl-install/install_steps.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/install_steps.pm
parent6f91f1c65c6afc807f87b6a4a20ae19776cd8a65 (diff)
downloaddrakx-backup-do-not-use-b60b957d3a8821b7f1afb298e40809d58deb3c9c.tar
drakx-backup-do-not-use-b60b957d3a8821b7f1afb298e40809d58deb3c9c.tar.gz
drakx-backup-do-not-use-b60b957d3a8821b7f1afb298e40809d58deb3c9c.tar.bz2
drakx-backup-do-not-use-b60b957d3a8821b7f1afb298e40809d58deb3c9c.tar.xz
drakx-backup-do-not-use-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/install_steps.pm')
-rw-r--r--perl-install/install_steps.pm10
1 files changed, 7 insertions, 3 deletions
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index d1509224b..74a7bab16 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -93,9 +93,12 @@ sub selectLanguage {
log::l("selectLanguage: pack_langs ", lang::pack_langs($o->{langs}));
- if ($o->{keyboard_unsafe} || !$o->{keyboard}) {
- $o->{keyboard_unsafe} = 1;
+ #- for auto_install compatibility with old $o->{keyboard} containing directly $o->{keyboard}{KEYBOARD}
+ $o->{keyboard} = { KEYBOARD => $o->{keyboard} } if $o->{keyboard} && !ref($o->{keyboard});
+
+ if (!$o->{keyboard} || $o->{keyboard}{unsafe}) {
$o->{keyboard} = keyboard::from_usb() || keyboard::lang2keyboard($o->{lang});
+ $o->{keyboard}{unsafe} = 1;
keyboard::setup($o->{keyboard}) if !$::live;
}
@@ -109,10 +112,11 @@ sub selectLanguage {
#------------------------------------------------------------------------------
sub selectKeyboard {
my ($o) = @_;
+ $o->{keyboard}{KBCHARSET} = lang::lang2charset($o->{lang});
keyboard::setup($o->{keyboard});
addToBeDone {
- keyboard::write($o->{prefix}, $o->{keyboard}, lang::lang2charset($o->{lang}));
+ keyboard::write($o->{keyboard});
} 'installPackages' unless $::g_auto_install;
}
#------------------------------------------------------------------------------