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

    r88ef769 r03e6a40  
    1616  the next chapter after the software has been installed.</para>
    1717
    18 <screen><userinput>ln -sv /tools/bin/{bash,cat,echo,grep,login,passwd,pwd,sleep,stty} ${CLFS}/bin
    19 ln -sv /tools/sbin/{agetty,blkid} ${CLFS}/sbin
     18<screen os="b"><userinput>ln -sv /tools/bin/{bash,cat,echo,grep,login,pwd,stty} ${CLFS}/bin
    2019ln -sv /tools/bin/file ${CLFS}/usr/bin
    2120ln -sv /tools/lib/libgcc_s.so{,.1} ${CLFS}/usr/lib
    22 ln -sv /tools/lib/libstd*so* ${CLFS}/usr/lib
     21ln -sv /tools/lib/libstdc++.so{.6,} ${CLFS}/usr/lib
     22sed -e 's/tools/usr/' /tools/lib/libstdc++.la &gt; ${CLFS}/usr/lib/libstdc++.la
    2323ln -sv bash ${CLFS}/bin/sh
    24 ln -sv /run ${CLFS}/var/run</userinput></screen>
     24ln -sv ../run ${CLFS}/var/run
     25ln -sv /tools/sbin/{fsck.ext2,fsck.ext3,fsck.ext4,e2fsck} ${CLFS}/sbin
     26ln -sv /tools/sbin/init ${CLFS}/sbin
     27ln -sv /tools/etc/{login.{access,defs},limits} ${CLFS}/etc</userinput></screen>
     28
     29  <para os="c">Historically, Linux maintains a list of the mounted file systems
     30  in the file <filename>/etc/mtab</filename>. Modern kernels maintain this list
     31  internally and expose it to the user via the
     32  <filename class="directory">/proc</filename> filesystem. To satisfy utilities
     33  that expect the presence of <filename>/etc/mtab</filename>, create the
     34  following symbolic link:</para>
     35
     36<screen os="d"><userinput>ln -sv /proc/self/mounts ${CLFS}/etc/mtab</userinput></screen>
    2537
    2638</sect1>
Note: See TracChangeset for help on using the changeset viewer.