Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed

  • BOOK/chroot/common/kernfs.xml

    r88ef769 r03e6a40  
    1111  <title>Mounting Virtual Kernel File Systems</title>
    1212
    13     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    14     href="../../boot/common/devices.xml"
    15     xpointer="xpointer(//*[@os='a'])"/>
     13    <note os="a">
     14      <para>The commands in the remainder of the book should be run as
     15      the <systemitem class="username">root</systemitem> user. Check
     16      that ${CLFS} is set in the
     17      <systemitem class="username">root</systemitem> user&rsquo;s environment
     18       before proceeding.</para>
     19    </note>
    1620
    1721  <para>Various file systems exported by the kernel are used to communicate
    … …  
    4246
    4347  <para>Once the system is complete and booting, the rest of our device
    44   nodes are created by the Eudev package.  Since this package is not
     48  nodes are created by Udev, part of Systemd.  Since this package is not
    4549  available to us right now, we must take other steps to provide device
    4650  nodes under on the CLFS filesystem.  We will use the <quote>bind</quote>
Note: See TracChangeset for help on using the changeset viewer.