Changeset 03e6a40 for BOOK/boot/common/e2fsprogs.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/boot/common/e2fsprogs.xml (modified) (2 diffs)

BOOK/boot/common/e2fsprogs.xml

@@ -48 +48 @@
       xpointer="xpointer(//*[@os='e2'])"/>
 
+      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../final-system/common/e2fsprogs.xml"
+      xpointer="xpointer(//*[@os='e3'])"/>
+
     </variablelist>
 
@@ -73 +77 @@
     xpointer="xpointer(//*[@os='l'])"/>
 
-    <para os="ad">Create needed symlinks for a bootable system:</para>
-
-<screen os="ae"><userinput>ln -sv /tools/sbin/{fsck.ext2,fsck.ext3,fsck.ext4,e2fsck} ${CLFS}/sbin</userinput></screen>
-
-
   </sect2>