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

File:
1 edited

Legend:

Unmodified
Added
Removed

  • BOOK/final-system/multilib/multiarch_wrapper.xml

    rec008670 r229ed25  
    9191<screen os="g"><userinput>echo 'echo "32bit Version"' &gt; test-32
    9292echo 'echo "64bit Version"' &gt; test-64
    93 chmod 755 test-32 test-64
     93chmod -v 755 test-32 test-64
    9494ln -sv /usr/bin/multiarch_wrapper test</userinput></screen>
    9595
    … …  
    103103<screen os="k" role="nodump"><userinput>32bit Version
    10410464bit Version</userinput></screen>
     105
     106    <para os="l">Remove the testcase source, binaries, and link:</para>
     107
     108<screen os="m"><userinput>rm -v multiarch_wrapper.c test{,-32,-64}</userinput></screen>
    105109
    106110  </sect2>
Note: See TracChangeset for help on using the changeset viewer.