From f3e78a2ebf8c9dbb6bbdf8fd2b062d92e2607a73 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Mon, 26 Nov 2007 16:37:36 +0000
Subject: - ensure /etc/sysconfig/console/default.kmap is generated with
 installed   keymaps, not installer simplified (?) .bkmap (#35376)

---
 perl-install/install/NEWS     | 2 ++
 perl-install/install/steps.pm | 3 +++
 2 files changed, 5 insertions(+)

(limited to 'perl-install/install')

diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 47720ce22..4287cfdcf 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,5 @@
+- ensure /etc/sysconfig/console/default.kmap is generated with installed
+  keymaps, not installer simplified (?) .bkmap (#35376)
 - add /etc/mke2fs.conf symlink so that mke2fs can use it (cf #27377)
 
 Version 10.5.5 - 14 November 2007, by Pascal "Pixel" Rigaux
diff --git a/perl-install/install/steps.pm b/perl-install/install/steps.pm
index 81e393cd0..c5715e2ef 100644
--- a/perl-install/install/steps.pm
+++ b/perl-install/install/steps.pm
@@ -140,6 +140,9 @@ sub selectKeyboard {
     keyboard::setup_install($o->{keyboard});
 
     addToBeDone {
+	#- the bkmap keymaps in installer are deficient, we need to load the real one before keyboard::write which will generate /etc/sysconfig/console/default.kmap
+	run_program::rooted($::prefix, 'loadkeys', keyboard::keyboard2kmap($o->{keyboard}))
+	    or log::l("loadkeys failed");
 	keyboard::write($o->{keyboard});
     } 'installPackages' if !$o->{isUpgrade} || !$o->{keyboard}{unsafe};
 
-- 
cgit v1.2.1