Changeset 229ed25 for BOOK/boot/common


Ignore:
Timestamp:
Jan 4, 2014, 12:03:38 AM (11 years ago)
Author:
Chris Staub <chris@…>
Branches:
clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit
Children:
f90d077
Parents:
ec008670 (diff), e57ce38 (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' into systemd

Conflicts:

BOOK/appendices/dependencies/common.xml
BOOK/boot/common/devices.xml
BOOK/boot/common/pwdgroup.xml
BOOK/boot/ppc64-64/powerpc-utils.xml
BOOK/boot/ppc64/util-linux-32.xml
BOOK/bootscripts/common/bootscripts.xml
BOOK/final-system/alpha-chapter.xml
BOOK/final-system/common/coreutils.xml
BOOK/final-system/common/eudev.xml
BOOK/final-system/common/kbd.xml
BOOK/final-system/mips-chapter.xml
BOOK/final-system/mips64-64-chapter.xml
BOOK/final-system/mips64-chapter.xml
BOOK/final-system/multilib/udev-64bit.xml
BOOK/final-system/multilib/util-linux.xml
BOOK/final-system/ppc-chapter.xml
BOOK/final-system/ppc64-chapter.xml
BOOK/final-system/sparc-chapter.xml
BOOK/final-system/sparc64-64-chapter.xml
BOOK/final-system/sparc64-chapter.xml
BOOK/final-system/x86-chapter.xml
BOOK/final-system/x86_64-64-chapter.xml
BOOK/final-system/x86_64-chapter.xml
BOOK/introduction/common/changelog.xml
BOOK/materials/common/packages.xml
BOOK/packages.ent

Location:
BOOK/boot/common
Files:
3 added
2 deleted
7 edited

Legend:

Unmodified
Added
Removed
  • BOOK/boot/common/createfiles.xml

    rec008670 r229ed25  
    1616  the next chapter after the software has been installed.</para>
    1717
    18 <screen><userinput>ln -sv /tools/bin/{bash,cat,echo,grep,pwd,sleep,stty} ${CLFS}/bin
     18<screen><userinput>ln -sv /tools/bin/{bash,cat,echo,grep,login,passwd,pwd,sleep,stty} ${CLFS}/bin
     19ln -sv /tools/sbin/{agetty,blkid} ${CLFS}/sbin
    1920ln -sv /tools/bin/file ${CLFS}/usr/bin
    2021ln -sv /tools/lib/libgcc_s.so{,.1} ${CLFS}/usr/lib
    2122ln -sv /tools/lib/libstd*so* ${CLFS}/usr/lib
    22 ln -sv bash ${CLFS}/bin/sh</userinput></screen>
     23ln -sv bash ${CLFS}/bin/sh
     24ln -sv /run ${CLFS}/var/run</userinput></screen>
    2325
    2426</sect1>
  • BOOK/boot/common/creatingdirs.xml

    rec008670 r229ed25  
    1515
    1616<screen os="b"><userinput>mkdir -pv ${CLFS}/{bin,boot,dev,{etc/,}opt,home,lib,mnt}
    17 mkdir -pv ${CLFS}/{proc,media/{floppy,cdrom},sbin,srv,sys}
    18 mkdir -pv ${CLFS}/var/{lock,log,mail,run,spool}
     17mkdir -pv ${CLFS}/{proc,media/{floppy,cdrom},run/{,shm},sbin,srv,sys}
     18mkdir -pv ${CLFS}/var/{lock,log,mail,spool}
    1919mkdir -pv ${CLFS}/var/{opt,cache,lib/{misc,locate},local}
    2020install -dv -m 0750 ${CLFS}/root
  • BOOK/boot/common/devices.xml

    rec008670 r229ed25  
    2020    <note os="a">
    2121      <para>The commands in the remainder of the book should be run as
    22       the <systemitem class="username">root</systemitem> user. Also,
    23       double-check that ${CLFS} is set as
    24       <systemitem class="username">root</systemitem>.</para>
     22      the <systemitem class="username">root</systemitem> user. Check
     23      that ${CLFS} is set in the
     24      <systemitem class="username">root</systemitem> user&rsquo;s environment
     25       before proceeding.</para>
    2526    </note>
    2627
  • BOOK/boot/common/fstab.xml

    rec008670 r229ed25  
    3232devpts         /dev/pts     devpts gid=&gid-tty;,mode=620   0     0
    3333shm            /dev/shm     tmpfs  defaults         0     0
     34tmpfs          /run         tmpfs  defaults         0     0
     35devtmpfs       /dev         devtmpfs mode=0755,nosuid 0     0
     36
    3437# End /etc/fstab</literal>
    3538EOF</userinput></screen>
  • BOOK/boot/common/pwdgroup.xml

    rec008670 r229ed25  
    192192
    193193  <para os="e">The created groups are not part of any standard&mdash;they are
    194   groups decided on in part by the requirements of the Udev configuration
     194  groups decided on in part by the requirements of the Eudev configuration
    195195  in the final system, and in part by common convention employed by a
    196196  number of existing Linux distributions. The Linux Standard Base (LSB,
  • BOOK/boot/common/sysvinit.xml

    rec008670 r229ed25  
    2424
    2525    <para os="aa">The following modifications help locate files specific to this
    26     perticular build:</para>
     26    particular build:</para>
    2727
    2828<screen os="ab"><userinput>cp -v src/Makefile{,.orig}
     
    8686
    8787<screen><userinput>cat &gt;&gt; ${CLFS}/etc/inittab &lt;&lt; "EOF"
    88 <literal>1:2345:respawn:/sbin/agetty -I '\033(K' tty1 9600
    89 2:2345:respawn:/sbin/agetty -I '\033(K' tty2 9600
    90 3:2345:respawn:/sbin/agetty -I '\033(K' tty3 9600
    91 4:2345:respawn:/sbin/agetty -I '\033(K' tty4 9600
    92 5:2345:respawn:/sbin/agetty -I '\033(K' tty5 9600
    93 6:2345:respawn:/sbin/agetty -I '\033(K' tty6 9600
     88<literal>1:2345:respawn:/sbin/agetty --noclear -I '\033(K' tty1 9600
     892:2345:respawn:/sbin/agetty --noclear -I '\033(K' tty2 9600
     903:2345:respawn:/sbin/agetty --noclear -I '\033(K' tty3 9600
     914:2345:respawn:/sbin/agetty --noclear -I '\033(K' tty4 9600
     925:2345:respawn:/sbin/agetty --noclear -I '\033(K' tty5 9600
     936:2345:respawn:/sbin/agetty --noclear -I '\033(K' tty6 9600
    9494</literal>
    9595EOF</userinput></screen>
     
    9999
    100100<screen><userinput>cat &gt;&gt; ${CLFS}/etc/inittab &lt;&lt; "EOF"
    101 <literal>c0:12345:respawn:/sbin/agetty 115200 ttyS0 vt100
     101<literal>c0:12345:respawn:/sbin/agetty --noclear 115200 ttyS0 vt100
    102102</literal>
    103103EOF</userinput></screen>
  • BOOK/boot/common/util-linux.xml

    rec008670 r229ed25  
    2222  <sect2 role="installation">
    2323    <title>Installation of Util-linux</title>
    24 
     24   
    2525    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    2626    href="../../final-system/common/util-linux.xml"
    2727    xpointer="xpointer(//*[@os='a'])"/>
    2828
    29 <screen os="b"><userinput>PKG_CONFIG=true \
     29<screen os="b"><userinput>PKG_CONFIG= \
    3030  ./configure --prefix=/tools --exec-prefix=/tools \
    3131    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
    32     --enable-login-utils --disable-makeinstall-chown</userinput></screen>
     32    --disable-makeinstall-chown --disable-login --disable-su</userinput></screen>
    3333
    3434    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Note: See TracChangeset for help on using the changeset viewer.