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/boot/mips64-chapter.xml

    r88ef769 r03e6a40  
    1313
    1414  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
     15  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
     16 <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/e2fsprogs.xml"/>
     17  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kmod.xml"/>
     18  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/shadow.xml"/>
     19  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/sysvinit.xml"/>
     20  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/eudev.xml"/>
     21  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/kernel.xml"/>
    1522  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/bootloaders.xml"/>
     23  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/colo-build.xml"/>
    1624  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/creatingdirs.xml"/>
    1725  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/createfiles.xml"/>
    18   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/util-linux.xml"/>
    19   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/shadow.xml"/>
    20  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/e2fsprogs.xml"/>
    21   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/sysvinit.xml"/>
    22   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kmod.xml"/>
    23   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/eudev.xml"/>
     26  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/devices.xml"/>
    2427  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pwdgroup.xml"/>
    25   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/kernel.xml"/>
    26   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/colo-build.xml"/>
     28  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/fstab.xml"/>
    2729  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/settingenviron.xml"/>
    2830  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/flags.xml"/>
    29   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/fstab.xml"/>
    30   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
    31   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/devices.xml"/>
    3231  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/changingowner.xml"/>
    3332  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/colo.xml"/>
Note: See TracChangeset for help on using the changeset viewer.