Ignore:
Timestamp:
Jan 4, 2014, 12:03:38 AM (11 years ago)
Author:
Chris Staub <chris@…>
Branches:
clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit
Children:
f90d077
Parents:
ec008670 (diff), e57ce38 (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 'master' into systemd

Conflicts:

BOOK/appendices/dependencies/common.xml
BOOK/boot/common/devices.xml
BOOK/boot/common/pwdgroup.xml
BOOK/boot/ppc64-64/powerpc-utils.xml
BOOK/boot/ppc64/util-linux-32.xml
BOOK/bootscripts/common/bootscripts.xml
BOOK/final-system/alpha-chapter.xml
BOOK/final-system/common/coreutils.xml
BOOK/final-system/common/eudev.xml
BOOK/final-system/common/kbd.xml
BOOK/final-system/mips-chapter.xml
BOOK/final-system/mips64-64-chapter.xml
BOOK/final-system/mips64-chapter.xml
BOOK/final-system/multilib/udev-64bit.xml
BOOK/final-system/multilib/util-linux.xml
BOOK/final-system/ppc-chapter.xml
BOOK/final-system/ppc64-chapter.xml
BOOK/final-system/sparc-chapter.xml
BOOK/final-system/sparc64-64-chapter.xml
BOOK/final-system/sparc64-chapter.xml
BOOK/final-system/x86-chapter.xml
BOOK/final-system/x86_64-64-chapter.xml
BOOK/final-system/x86_64-chapter.xml
BOOK/introduction/common/changelog.xml
BOOK/materials/common/packages.xml
BOOK/packages.ent

File:
1 edited

Legend:

Unmodified
Added
Removed
  • BOOK/bootable/x86/kernel.xml

    rec008670 r229ed25  
    3838
    3939    <para os="h">Configure the kernel via a menu-driven interface.
    40     Please note that the udev bootscript requires "rtc" and "tmpfs" to be
     40    Please note that the udev bootscript requires "rtc", "tmpfs" and "devtmpfs" to be
    4141    enabled and built into the kernel, not as modules. CBLFS has
    4242    some information regarding particular kernel configuration requirements of
     
    7272    kernel modules because it usually applies to 2.4.x kernels only. As
    7373    far as we know, kernel configuration issues specific to Hotplug and
    74     Udev are not documented. The problem is that Udev will create a device
     74    Eudev are not documented. The problem is that Eudev will create a device
    7575    node only if Hotplug or a user-written script inserts the corresponding
    7676    module into the kernel, and not all modules are detectable by Hotplug.
    7777    Note that statements like the one below in the
    78     <filename>/etc/modprobe.conf</filename> file do not work with Udev:</para>
     78    <filename>/etc/modprobe.conf</filename> file do not work with Eudev:</para>
    7979
    8080<screen os="q"><literal>alias char-major-XXX some-module</literal></screen>
    8181
    82     <para os="r">Because of the complications with Udev and modules,
     82    <para os="r">Because of the complications with Eudev and modules,
    8383    we strongly recommend starting with a completely non-modular kernel
    84     configuration, especially if this is the first time using Udev.</para>
     84    configuration, especially if this is the first time using Eudev.</para>
    8585
    8686    <para os="s">Install the modules, if the kernel configuration uses
     
    8888
    8989<screen os="t"><userinput>make modules_install</userinput></screen>
     90
     91    <para os="s2">Install the firmware, if the kernel configuration uses
     92    them:</para>
     93
     94<screen os="t2"><userinput>make firmware_install</userinput></screen>
    9095
    9196    <para os="u">After kernel compilation is complete, additional steps are
Note: See TracChangeset for help on using the changeset viewer.