From 2ea6929754f88fc50693ca23faa42947da93a863 Mon Sep 17 00:00:00 2001
From: Mark Hymers <markh@linuxfromscratch.org>
Date: Mon, 6 Aug 2001 11:00:11 +0000
Subject: [PATCH] Bug 43 and 47: keymap fix

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@906 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter06/kbd-exp.xml  |  7 ++-----
 chapter06/kbd-inst.xml | 13 ++-----------
 chapter07/loadkeys.xml | 42 ++++++++++++++++++++++++++++++++++++++----
 3 files changed, 42 insertions(+), 20 deletions(-)

diff --git a/chapter06/kbd-exp.xml b/chapter06/kbd-exp.xml
index e00d4b751..f084752bf 100644
--- a/chapter06/kbd-exp.xml
+++ b/chapter06/kbd-exp.xml
@@ -8,11 +8,8 @@ the FHS suggests.</para>
 <para><userinput>rm 
 /usr/share/kbd/keymaps/i386/qwerty/defkeymap.map.gz:</userinput> We
 remove this file because we don't know which keymap you 
-need to use.</para>
-
-<para><userinput>ln -s &lt;path-to-keymap&gt; defkeymap.map.gz</userinput>
-With this command you set the default keymap that can be loaded using
-the <userinput>loadkeys -d</userinput> command.</para>
+need to use.  As said above, we will be defining the default keymap in
+chapter 7 when the system configuration files are created.</para>
 
 </sect2>
 
diff --git a/chapter06/kbd-inst.xml b/chapter06/kbd-inst.xml
index 1733fb310..3529768c7 100644
--- a/chapter06/kbd-inst.xml
+++ b/chapter06/kbd-inst.xml
@@ -8,17 +8,8 @@
 <userinput>make install &amp;&amp;</userinput>
 <userinput>rm /usr/share/kbd/keymaps/i386/qwerty/defkeymap.map.gz</userinput></screen></para>
 
-<para>Now we have to choose a default keymap. Explore the
-/usr/share/kbd/keymaps directory, and find the keymap that you would like to use
-as a default. Then execute this command:</para>
-
-<para><screen><userinput>cd /usr/share/kbd/keymaps &amp;&amp;</userinput>
-<userinput>ln -s &lt;path-to-keymap&gt; defkeymap.map.gz</userinput></screen></para>
-
-<para>Replace <userinput>&lt;path-to-keymap&gt;</userinput> with the path to the
-keymap you have selected, relative to the /usr/share/kbd/keymaps/ directory. For
-example, if you have chosen the US keymap, you would replace it with
-i386/qwerty/us.map.gz.</para>
+<para>We will be defining our default keymap later on when we create the
+system configuration files in chapter 7.</para>
 
 </sect2>
 
diff --git a/chapter07/loadkeys.xml b/chapter07/loadkeys.xml
index 07d003538..a9ed74dae 100644
--- a/chapter07/loadkeys.xml
+++ b/chapter07/loadkeys.xml
@@ -1,10 +1,16 @@
 <sect1 id="ch07-loadkeys">
 <title>Creating the loadkeys script</title>
 
+<!--
 <para>You only need to create this script if you don't have a 
-default 101 keys US keyboard layout. Create the 
-<filename>/etc/init.d/loadkeys</filename> script by running the
-following command:</para>
+default 101 keys US keyboard layout. 
+
+Because we've scrapped the symbolic link for the default, I assume 
+that everyone will need this script?
+-->
+
+<para>Create the <filename>/etc/init.d/loadkeys</filename> script by 
+running the following command:</para>
 
 <para><screen><userinput>cat &gt; loadkeys &lt;&lt; "EOF"</userinput>
 #!/bin/sh
@@ -16,16 +22,44 @@ following command:</para>
 
 source /etc/init.d/functions
 
+#
+# Include /etc/sysconfig/keyboard which contains the LAYOUT variable
+#
+
+source /etc/sysconfig/keyboard
+
 #
 # Load the default keymap file
 #
 
 echo -n "Loading keymap..."
-/bin/loadkeys -d 2&gt;/dev/null
+/bin/loadkeys $LAYOUT 2&gt;/dev/null
 evaluate_retval
 
 # End /etc/init.d/loadkeys
 <userinput>EOF</userinput></screen></para>
 
+<sect2>
+<title>Creating the /etc/sysconfig/keyboard file</title>
+ 
+<para>Create a new file <filename>/etc/sysconfig/keyboard</filename> 
+by running the following:</para>
+ 
+<para><screen><userinput>cat &gt; /etc/sysconfig/keyboard &lt;&lt; "EOF"</userinput
+>
+# Begin /etc/sysconfig/keyboard
+ 
+LAYOUT=&lt;path-to-keymap&gt;
+ 
+# End /etc/sysconfig/keyboard
+<userinput>EOF</userinput></screen></para>
+
+<para>Replace <userinput>&lt;path-to-keymap&gt;</userinput> with the
+path to the keymap you have selected.  For example, if you have chosen the 
+US keymap, you would replace it with 
+<userinput>/usr/share/kbd/keymaps/i386/qwerty/us.map.gz.</userinput></para>
+
+</sect2>
+
 </sect1>