Changeset 1ab9a96 for BOOK/final-system


Ignore:
Timestamp:
May 17, 2014, 8:41:51 AM (10 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:
1 edited

Legend:

Unmodified
Added
Removed

  • BOOK/final-system/common/kbd.xml

    rb4badbd r1ab9a96  
    4343<screen os="h"><userinput>make install</userinput></screen>
    4444
    45     <para os="i">Some of the programs from Kbd are used by systemd to
    46     initialize the system, those binaries need to be on the root
     45    <para os="i">Some of the programs from Kbd are used by the CLFS Bootscripts
     46    to initialize the system, so those binaries need to be on the root
    4747    partition:</para>
    4848
    49 <screen os="j"><userinput>mv -v /usr/bin/{loadkeys,setfont} /bin</userinput></screen>
     49<screen os="j"><userinput>mv -v /usr/bin/{dumpkeys,kbd_mode,loadkeys,setfont} /bin</userinput></screen>
    5050
    5151    <para os="k">Install the documentation:</para>
Note: See TracChangeset for help on using the changeset viewer.