Changeset 21e76b6


Ignore:
Timestamp:
Jun 13, 2014, 8:59:26 PM (6 years ago)
Author:
William Harrington <kb0iic@…>
Branches:
clfs-3.0.0-systemd, master, systemd
Children:
73e033d
Parents:
d94bdd0 (diff), 4e982a0 (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' of cross-lfs.org:cross-lfs

Location:
BOOK
Files:
14 edited

Legend:

Unmodified
Added
Removed
  • BOOK/boot/mips/kernel.xml

    rd94bdd0 r21e76b6  
    6161    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    6262    href="../x86/kernel.xml"
    63     xpointer="xpointer(//*[@os='p'])"/>
    64 
    65     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    66     href="../x86/kernel.xml"
    67     xpointer="xpointer(//*[@os='q'])"/>
    68 
    69     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    70     href="../x86/kernel.xml"
    7163    xpointer="xpointer(//*[@os='s'])"/>
    7264
  • BOOK/boot/mips64/kernel.xml

    rd94bdd0 r21e76b6  
    6565    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    6666    href="../x86/kernel.xml"
    67     xpointer="xpointer(//*[@os='p'])"/>
    68 
    69     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    70     href="../x86/kernel.xml"
    71     xpointer="xpointer(//*[@os='q'])"/>
    72 
    73     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    74     href="../x86/kernel.xml"
    7567    xpointer="xpointer(//*[@os='s'])"/>
    7668
  • BOOK/boot/ppc/kernel.xml

    rd94bdd0 r21e76b6  
    6666    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    6767    href="../x86/kernel.xml"
    68     xpointer="xpointer(//*[@os='p'])"/>
    69 
    70     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    71     href="../x86/kernel.xml"
    72     xpointer="xpointer(//*[@os='q'])"/>
    73 
    74     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    75     href="../x86/kernel.xml"
    7668    xpointer="xpointer(//*[@os='s'])"/>
    7769
  • BOOK/boot/ppc64/kernel.xml

    rd94bdd0 r21e76b6  
    6565    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    6666    href="../x86/kernel.xml"
    67     xpointer="xpointer(//*[@os='p'])"/>
    68 
    69     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    70     href="../x86/kernel.xml"
    71     xpointer="xpointer(//*[@os='q'])"/>
    72 
    73     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    74     href="../x86/kernel.xml"
    7567    xpointer="xpointer(//*[@os='s'])"/>
    7668
  • BOOK/boot/sparc/kernel.xml

    rd94bdd0 r21e76b6  
    6161    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    6262    href="../x86/kernel.xml"
    63     xpointer="xpointer(//*[@os='p'])"/>
    64 
    65     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    66     href="../x86/kernel.xml"
    67     xpointer="xpointer(//*[@os='q'])"/>
    68 
    69     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    70     href="../x86/kernel.xml"
    7163    xpointer="xpointer(//*[@os='s'])"/>
    7264
  • BOOK/boot/sparc64/kernel.xml

    rd94bdd0 r21e76b6  
    6363    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    6464    href="../x86/kernel.xml"
    65     xpointer="xpointer(//*[@os='p'])"/>
    66 
    67     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    68     href="../x86/kernel.xml"
    69     xpointer="xpointer(//*[@os='q'])"/>
    70 
    71     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    72     href="../x86/kernel.xml"
    7365    xpointer="xpointer(//*[@os='s'])"/>
    7466
  • BOOK/boot/x86/kernel.xml

    rd94bdd0 r21e76b6  
    8282    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    8383    href="../../bootable/x86/kernel.xml"
    84     xpointer="xpointer(//*[@os='p'])"/>
    85 
    86     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    87     href="../../bootable/x86/kernel.xml"
    88     xpointer="xpointer(//*[@os='q'])"/>
    89 
    90     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    91     href="../../bootable/x86/kernel.xml"
    9284    xpointer="xpointer(//*[@os='s'])"/>
    9385
  • BOOK/boot/x86_64/kernel.xml

    rd94bdd0 r21e76b6  
    6565    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    6666    href="../x86/kernel.xml"
    67     xpointer="xpointer(//*[@os='p'])"/>
    68 
    69     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    70     href="../x86/kernel.xml"
    71     xpointer="xpointer(//*[@os='q'])"/>
    72 
    73     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    74     href="../x86/kernel.xml"
    7567    xpointer="xpointer(//*[@os='s'])"/>
    7668
  • BOOK/bootable/mips/kernel.xml

    rd94bdd0 r21e76b6  
    7272    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    7373    href="../x86/kernel.xml"
    74     xpointer="xpointer(//*[@os='p'])"/>
    75 
    76     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    77     href="../x86/kernel.xml"
    78     xpointer="xpointer(//*[@os='q'])"/>
    79 
    80     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    81     href="../x86/kernel.xml"
    82     xpointer="xpointer(//*[@os='r'])"/>
    83 
    84     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    85     href="../x86/kernel.xml"
    8674    xpointer="xpointer(//*[@os='s'])"/>
    8775
  • BOOK/bootable/ppc/kernel.xml

    rd94bdd0 r21e76b6  
    8484    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    8585    href="../x86/kernel.xml"
    86     xpointer="xpointer(//*[@os='p'])"/>
    87 
    88     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    89     href="../x86/kernel.xml"
    90     xpointer="xpointer(//*[@os='q'])"/>
    91 
    92     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    93     href="../x86/kernel.xml"
    94     xpointer="xpointer(//*[@os='r'])"/>
    95 
    96     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    97     href="../x86/kernel.xml"
    9886    xpointer="xpointer(//*[@os='s'])"/>
    9987
  • BOOK/bootable/sparc/kernel.xml

    rd94bdd0 r21e76b6  
    7676    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    7777    href="../x86/kernel.xml"
    78     xpointer="xpointer(//*[@os='p'])"/>
    79 
    80     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    81     href="../x86/kernel.xml"
    82     xpointer="xpointer(//*[@os='q'])"/>
    83 
    84     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    85     href="../x86/kernel.xml"
    86     xpointer="xpointer(//*[@os='r'])"/>
    87 
    88     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    89     href="../x86/kernel.xml"
    9078    xpointer="xpointer(//*[@os='s'])"/>
    9179
  • BOOK/bootable/x86/kernel.xml

    rd94bdd0 r21e76b6  
    104104<screen os="n"><userinput>make</userinput></screen>
    105105
    106     <para os="o">If using kernel modules, an
    107     <filename>/etc/modprobe.conf</filename> file may be needed.
     106    <para os="o">If using kernel modules, a configuration file in
     107    <filename class="directory">/etc/modprobe.d</filename> file may be needed.
    108108    Information pertaining to modules and kernel configuration is
    109109    located in the kernel documentation in the <filename
    110110    class="directory">Documentation</filename> directory of the kernel
    111     sources tree. Also, <filename>modprobe.conf(5)</filename> may
     111    sources tree. Also, <filename>modprobe.d(5)</filename> may
    112112    be of interest.</para>
    113 
    114     <para os="p">Be very careful when reading other documentation relating to
    115     kernel modules because it usually applies to 2.4.x kernels only. As
    116     far as we know, kernel configuration issues specific to Hotplug and
    117     Eudev are not documented. The problem is that Eudev will create a device
    118     node only if Hotplug or a user-written script inserts the corresponding
    119     module into the kernel, and not all modules are detectable by Hotplug.
    120     Note that statements like the one below in the
    121     <filename>/etc/modprobe.conf</filename> file do not work with Eudev:</para>
    122 
    123 <screen os="q"><literal>alias char-major-XXX some-module</literal></screen>
    124 
    125     <para os="r">Because of the complications with Eudev and modules,
    126     we strongly recommend starting with a completely non-modular kernel
    127     configuration, especially if this is the first time using Eudev.</para>
    128113
    129114    <para os="s">Install the modules, if the kernel configuration uses
  • BOOK/bootable/x86_64/kernel.xml

    rd94bdd0 r21e76b6  
    7676    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    7777    href="../x86/kernel.xml"
    78     xpointer="xpointer(//*[@os='p'])"/>
    79 
    80     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    81     href="../x86/kernel.xml"
    82     xpointer="xpointer(//*[@os='q'])"/>
    83 
    84     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    85     href="../x86/kernel.xml"
    86     xpointer="xpointer(//*[@os='r'])"/>
    87 
    88     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    89     href="../x86/kernel.xml"
    9078    xpointer="xpointer(//*[@os='s'])"/>
    9179
  • BOOK/introduction/common/changelog.xml

    rd94bdd0 r21e76b6  
    4646          <para>[William Harrington] - Update File to 5.19.</para>
    4747        </listitem>
     48        <listitem>
     49          <para>[Chris] - Text updates to kernel installation page.</para>
     50        </listitem>
    4851      </itemizedlist>
    4952    </listitem>
Note: See TracChangeset for help on using the changeset viewer.