Changeset 1ab9a96 for BOOK/final-system/common

Timestamp:

May 17, 2014, 8:41:51 AM (11 years ago)

Author:

William Harrington <kb0iic@…>

Branches:

clfs-3.0.0-sysvinit, sysvinit

Children:

3205da5

Parents:

b4badbd (diff), 156c0fe (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Fix conflicts with merge.

File:

• BOOK/final-system/common/kbd.xml (modified) (1 diff)

BOOK/final-system/common/kbd.xml

@@ -43 +43 @@
 <screen os="h"><userinput>make install</userinput></screen>
 
-    <para os="i">Some of the programs from Kbd are used by systemd to
-    initialize the system, those binaries need to be on the root
+    <para os="i">Some of the programs from Kbd are used by the CLFS Bootscripts
+    to initialize the system, so those binaries need to be on the root
     partition:</para>
 
-<screen os="j"><userinput>mv -v /usr/bin/{loadkeys,setfont} /bin</userinput></screen>
+<screen os="j"><userinput>mv -v /usr/bin/{dumpkeys,kbd_mode,loadkeys,setfont} /bin</userinput></screen>
 
     <para os="k">Install the documentation:</para>