Changeset 69ae77b


Ignore:
Timestamp:
Dec 7, 2015, 4:33:35 AM (4 years ago)
Author:
Chris Staub <chris@…>
Branches:
master, systemd
Children:
93adfd5f
Parents:
fc19382 (diff), fe23bd1 (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' of clfs.org:cross-lfs

Location:
BOOK/final-system
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • BOOK/final-system/common/procps-ng.xml

    rfc19382 r69ae77b  
    6868    <filename class="directory">/usr</filename> is not mounted:</para>
    6969
    70 <screen os="k"><userinput>mv -v /usr/bin/pidof /bin
    71 mv -v /usr/lib/libprocps.so.* /lib
     70<screen os="k"><userinput>mv -v /usr/lib/libprocps.so.* /lib
    7271ln -sfv ../../lib/$(readlink /usr/lib/libprocps.so) /usr/lib/libprocps.so</userinput></screen>
    7372
  • BOOK/final-system/multilib/procps-ng-64bit.xml

    rfc19382 r69ae77b  
    6262    xpointer="xpointer(//*[@os='j'])"/>
    6363
    64 <screen os="k"><userinput>mv -v /usr/bin/pidof /bin
    65 mv -v /usr/lib64/libprocps.so.* /lib64
     64<screen os="k"><userinput>mv -v /usr/lib64/libprocps.so.* /lib64
    6665ln -sfv ../../lib64/$(readlink /usr/lib64/libprocps.so) /usr/lib64/libprocps.so</userinput></screen>
    6766
  • BOOK/final-system/multilib/procps-ng-n32.xml

    rfc19382 r69ae77b  
    6363    xpointer="xpointer(//*[@os='j'])"/>
    6464
    65 <screen os="k"><userinput>mv -v /usr/bin/pidof /bin
    66 mv -v /usr/lib32/libprocps.so.* /lib32
     65<screen os="k"><userinput>mv -v /usr/lib32/libprocps.so.* /lib32
    6766ln -sfv ../../lib32/$(readlink /usr/lib32/libprocps.so) /usr/lib32/libprocps.so</userinput></screen>
    6867
  • BOOK/final-system/multilib/procps-ng.xml

    rfc19382 r69ae77b  
    6767    xpointer="xpointer(//*[@os='j'])"/>
    6868
    69 <screen os="k"><userinput>mv -v /usr/bin/pidof /bin
    70 mv -v /usr/lib/libprocps.so.* /lib
     69<screen os="k"><userinput>mv -v /usr/lib/libprocps.so.* /lib
    7170ln -sfv ../../lib/$(readlink /usr/lib/libprocps.so) /usr/lib/libprocps.so</userinput></screen>
    7271
Note: See TracChangeset for help on using the changeset viewer.