Changeset c54a540 for BOOK/chroot


Ignore:
Timestamp:
May 11, 2014, 2:03:47 AM (11 years ago)
Author:
William Harrington <kb0iic@…>
Branches:
clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit
Children:
7184ed0c
Parents:
4190ca2 (diff), b925729 (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' of cross-lfs.org:cross-lfs into systemd

Location:
BOOK/chroot
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • BOOK/chroot/64/createfiles.xml

    r4190ca2 rc54a540  
    2626
    2727  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     28  href="../../boot/common/createfiles.xml"
     29  xpointer="xpointer(//*[@os='c'])"/>
     30
     31  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    2832  href="../../boot/64/createfiles.xml"
    29   xpointer="xpointer(//*[@os='e'])"/>
     33  xpointer="xpointer(//*[@os='f'])"/>
    3034
    3135<screen><userinput>mkdir -pv /usr/lib64
    … …  
    3337
    3438    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    35     href="../../boot/common/createfiles.xml"
    36     xpointer="xpointer(//*[@os='c'])"/>
     39    href="../common/createfiles.xml"
     40    xpointer="xpointer(//*[@os='d'])"/>
    3741
    3842    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    3943    href="../common/createfiles.xml"
    40     xpointer="xpointer(//*[@os='d'])"/>
     44    xpointer="xpointer(//*[@os='e'])"/>
    4145
    4246</sect1>

  • BOOK/chroot/common/createfiles.xml

    r4190ca2 rc54a540  
    2323ln -sv /run /var/run</userinput></screen>
    2424
     25    <variablelist os="c">
     26      <title>The purpose of each link:</title>
     27
     28      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     29      href="../../boot/common/createfiles.xml"
     30      xpointer="xpointer(//*[@os='c1'])"/>
     31
     32      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     33      href="../../boot/common/createfiles.xml"
     34      xpointer="xpointer(//*[@os='c2'])"/>
     35
     36      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     37      href="../../boot/common/createfiles.xml"
     38      xpointer="xpointer(//*[@os='c3'])"/>
     39
     40      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     41      href="../../boot/common/createfiles.xml"
     42      xpointer="xpointer(//*[@os='c4'])"/>
     43
     44      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     45      href="../../boot/common/createfiles.xml"
     46      xpointer="xpointer(//*[@os='c6'])"/>
     47
     48      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     49      href="../../boot/common/createfiles.xml"
     50      xpointer="xpointer(//*[@os='c7'])"/>
     51
     52      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     53      href="../../boot/common/createfiles.xml"
     54      xpointer="xpointer(//*[@os='c8'])"/>
     55
     56      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     57      href="../../boot/common/createfiles.xml"
     58      xpointer="xpointer(//*[@os='c9'])"/>
     59
     60      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     61      href="../../boot/common/createfiles.xml"
     62      xpointer="xpointer(//*[@os='c10'])"/>
     63
     64      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     65      href="../../boot/common/createfiles.xml"
     66      xpointer="xpointer(//*[@os='c11'])"/>
     67
     68      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     69      href="../../boot/common/createfiles.xml"
     70      xpointer="xpointer(//*[@os='c12'])"/>
     71
     72      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     73      href="../../boot/common/createfiles.xml"
     74      xpointer="xpointer(//*[@os='c13'])"/>
     75
     76    </variablelist>
     77
    2578    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    2679    href="../../boot/common/createfiles.xml"
    27     xpointer="xpointer(//*[@os='c'])"/>
     80    xpointer="xpointer(//*[@os='d'])"/>
    2881
    29 <screen os="d"><userinput>ln -sv /proc/self/mounts /etc/mtab</userinput></screen>
     82<screen os="e"><userinput>ln -sv /proc/self/mounts /etc/mtab</userinput></screen>
    3083
    3184</sect1>

  • BOOK/chroot/multilib/createfiles.xml

    r4190ca2 rc54a540  
    3232    xpointer="xpointer(//*[@os='d'])"/>
    3333
     34    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     35    href="../common/createfiles.xml"
     36    xpointer="xpointer(//*[@os='d'])"/>
     37
    3438</sect1>
Note: See TracChangeset for help on using the changeset viewer.