Changeset 03e6a40 for BOOK/chroot/x86/before-chroot.xml

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:

• BOOK/chroot/x86/before-chroot.xml (modified) (3 diffs)

BOOK/chroot/x86/before-chroot.xml

@@ -35 +35 @@
     <command>config.guess</command>:</para>
 
-<screen><userinput>build-aux/config.guess</userinput></screen>
+<screen><userinput>lib/config.guess</userinput></screen>
 
     <para>If the output of that command does not equal what is in
@@ -55 +55 @@
     directory:</para>
 
-<screen><userinput>setarch linux32 build-aux/config.guess</userinput></screen>
+<screen><userinput>setarch linux32 lib/config.guess</userinput></screen>
 
     <para>If the output of the command above equals what is in
@@ -125 +125 @@
     directory:</para>
 
-<screen os="uui"><userinput>build-aux/config.guess</userinput></screen>
+<screen os="uui"><userinput>lib/config.guess</userinput></screen>
 
     <para os="uuj">The output of the above command should be the same as the