summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2007-11-26 16:37:36 +0000
committerPascal Rigaux <pixel@mandriva.com>2007-11-26 16:37:36 +0000
commitf3e78a2ebf8c9dbb6bbdf8fd2b062d92e2607a73 (patch)
treed63c1ddf6b967fd6fe1d62992a8c806475c5ba6e
parent0778a1262db70474e362ac55da0690c681e51e18 (diff)
downloaddrakx-f3e78a2ebf8c9dbb6bbdf8fd2b062d92e2607a73.tar
drakx-f3e78a2ebf8c9dbb6bbdf8fd2b062d92e2607a73.tar.gz
drakx-f3e78a2ebf8c9dbb6bbdf8fd2b062d92e2607a73.tar.bz2
drakx-f3e78a2ebf8c9dbb6bbdf8fd2b062d92e2607a73.tar.xz
drakx-f3e78a2ebf8c9dbb6bbdf8fd2b062d92e2607a73.zip
- ensure /etc/sysconfig/console/default.kmap is generated with installed
keymaps, not installer simplified (?) .bkmap (#35376)
-rw-r--r--perl-install/install/NEWS2
-rw-r--r--perl-install/install/steps.pm3
2 files changed, 5 insertions, 0 deletions
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};