Changeset 03e6a40 for BOOK/final-system/common/kbd.xml

Timestamp:

Apr 20, 2014, 8:57:39 AM (11 years ago)

Author:

Chris Staub <chris@…>

Children:

0be79ea

Parents:

88ef769 (diff), 578ca586 (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:

Merge branch 'systemd' into simp

Conflicts:

BOOK/final-system/common/bash.xml
BOOK/final-system/mips64-chapter.xml
BOOK/final-system/multilib/bash.xml
BOOK/final-system/ppc64-chapter.xml
BOOK/final-system/sparc64-chapter.xml
BOOK/final-system/x86_64-chapter.xml
BOOK/general.ent
BOOK/packages.ent
BOOK/temp-system/common/bash.xml
BOOK/temp-system/mips64-64-chapter.xml
BOOK/temp-system/mips64-chapter.xml
BOOK/temp-system/multilib/bash.xml
BOOK/temp-system/ppc64-64-chapter.xml
BOOK/temp-system/ppc64-chapter.xml
BOOK/temp-system/sparc64-64-chapter.xml
BOOK/temp-system/sparc64-chapter.xml
BOOK/temp-system/x86_64-64-chapter.xml
BOOK/temp-system/x86_64-chapter.xml

File:

• BOOK/final-system/common/kbd.xml (modified) (2 diffs)

BOOK/final-system/common/kbd.xml

@@ -41 +41 @@
 <screen os="g"><userinput>make install</userinput></screen>
 
-    <para os="h">Some of the programs from Kbd are used by scripts
-    in the CLFS-Bootscripts package. As <filename
-    class="directory">/usr</filename> may not be available during the early
-    stages of booting, those binaries need to be on the root partition:</para>
-
-<screen os="i"><userinput>mv -v /usr/bin/{kbd_mode,dumpkeys,loadkeys,openvt,setfont,setvtrgb} /bin</userinput></screen>
+    <para os="h">Some of the programs from Kbd are used by Systemd to
+    initialize the system, those binaries need to be on the root
+    partition:</para>
+
+<screen os="i"><userinput>mv -v /usr/bin/{loadkeys,setfont} /bin</userinput></screen>
+
+    <para os="j">Install the documentation:</para>
+
+<screen os="k"><userinput>mkdir -v /usr/share/doc/kbd-&kbd-version;
+cp -R -v docs/doc/* /usr/share/doc/kbd-&kbd-version;</userinput></screen>
 
   </sect2>
@@ -65 +69 @@
         unicode_start, and unicode_stop</seg>
         <seg>/usr/share/consolefonts, /usr/share/consoletrans,
+        /usr/share/doc/kbd-&kbd-version;,
         /usr/share/keymaps, /usr/share/unimaps</seg>
       </seglistitem>