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/createfiles.xml

    r88ef769 r03e6a40  
    1111  <title>Creating Essential Symlinks</title>
    1212
    13   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    14   href="../../boot/common/createfiles.xml"
    15   xpointer="xpointer(//*[@os='a'])"/>
     13    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     14    href="../../boot/common/createfiles.xml"
     15    xpointer="xpointer(//*[@os='a'])"/>
    1616
    1717<screen><userinput>ln -sv /tools/bin/{bash,cat,echo,grep,pwd,stty} /bin
    1818ln -sv /tools/bin/file /usr/bin
    1919ln -sv /tools/lib/libgcc_s.so{,.1} /usr/lib
    20 ln -sv /tools/lib/libstd* /usr/lib
     20ln -sv /tools/lib/libstdc++.so{.6,} /usr/lib
     21sed -e 's/tools/usr/' /tools/lib/libstdc++.la > /usr/lib/libstdc++.la
    2122ln -sv bash /bin/sh
    2223ln -sv /run /var/run</userinput></screen>
    2324
     25    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     26    href="../../boot/common/createfiles.xml"
     27    xpointer="xpointer(//*[@os='c'])"/>
     28
     29<screen os="d"><userinput>ln -sv /proc/self/mounts /etc/mtab</userinput></screen>
     30
    2431</sect1>
Note: See TracChangeset for help on using the changeset viewer.