r2144 - / trunk/BOOK/boot/x86 trunk/BOOK/bootable/x86 trunk/BOOK/introduction/common

jim at linuxfromscratch.org jim at linuxfromscratch.org
Mon Jul 24 00:46:53 PDT 2006


Author: jim
Date: 2006-07-24 01:46:47 -0600 (Mon, 24 Jul 2006)
New Revision: 2144

Modified:
   /
   trunk/BOOK/boot/x86/kernel.xml
   trunk/BOOK/bootable/x86/kernel.xml
   trunk/BOOK/introduction/common/changelog.xml
Log:
 r4907 at server (orig r2265):  chris at beaker67.com | 2006-07-24 00:12:50 -0700
 Updated commands for building keymap into the kernel



Property changes on: 
___________________________________________________________________
Name: svk:merge
   - b6734a72-470d-0410-b049-f317dca95413:/:2264
   + b6734a72-470d-0410-b049-f317dca95413:/:2265

Modified: trunk/BOOK/boot/x86/kernel.xml
===================================================================
--- trunk/BOOK/boot/x86/kernel.xml	2006-07-24 07:46:37 UTC (rev 2143)
+++ trunk/BOOK/boot/x86/kernel.xml	2006-07-24 07:46:47 UTC (rev 2144)
@@ -48,13 +48,14 @@
     href="../../bootable/x86/kernel.xml"
     xpointer="xpointer(//*[@os='d'])"/>
 
-    <para os="ab">If your keyboard isn't an US one, you may want to build
-    the proper keymap for your keyboard layout inside the kernel. Do it by
-    running the following command:</para>
+    <para os="ab">If your keyboard isn't a US one and you have Kbd installed
+    on your host system, you can build the proper keymap for your keyboard
+    layout inside the kernel. If you wish to do this, run the following
+    command (replace [path to keymap] with the keymap location on the host -
+    a common location is in /usr/share/kbd):</para>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/x86/kernel.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
+<screen os="f"><userinput>loadkeys -m <replaceable>[path to  keymap]</replaceable> > \
+    drivers/char/defkeymap.c</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../bootable/x86/kernel.xml"

Modified: trunk/BOOK/bootable/x86/kernel.xml
===================================================================
--- trunk/BOOK/bootable/x86/kernel.xml	2006-07-24 07:46:37 UTC (rev 2143)
+++ trunk/BOOK/bootable/x86/kernel.xml	2006-07-24 07:46:47 UTC (rev 2144)
@@ -40,11 +40,11 @@
     decided to compile the keymap into the kernel, issue the command
     below:</para>
 
-<screen os="f"><userinput>loadkeys -m /usr/share/kbd/keymaps/<replaceable>[path to  keymap]</replaceable> > \
+<screen os="f"><userinput>loadkeys -m /lib/kbd/keymaps/<replaceable>[path to  keymap]</replaceable> > \
     drivers/char/defkeymap.c</userinput></screen>
 
     <para os="g">For example, if using a Dutch keyboard, use
-    <filename>/usr/share/kbd/keymaps/i386/qwerty/nl.map.gz</filename>.</para>
+    <filename>/lib/kbd/keymaps/i386/qwerty/nl.map.gz</filename>.</para>
 
     <para os="h">Configure the kernel via a menu-driven interface.
     Please note that the udev bootscript requires "rtc" and "tmpfs" to be

Modified: trunk/BOOK/introduction/common/changelog.xml
===================================================================
--- trunk/BOOK/introduction/common/changelog.xml	2006-07-24 07:46:37 UTC (rev 2143)
+++ trunk/BOOK/introduction/common/changelog.xml	2006-07-24 07:46:47 UTC (rev 2144)
@@ -37,6 +37,19 @@
 -->
 
     <listitem>
+      <para>July 24, 2006</para>
+      <itemizedlist>
+        <listitem>
+          <para>[Chris] - Updated commands for building the keymap into the
+          kernel - changed the bootable/kernel page to account for the new
+          keymap files location, and changed the instructions in the "boot"
+          section to reflect that fact that we don't know where the keymap
+          files may be on the host (fixes ticket #56).</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>July 20, 2006</para>
       <itemizedlist>
         <listitem>




More information about the cross-lfs mailing list