Changeset 03e6a40 for BOOK/final-system/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/final-system/common/e2fsprogs.xml (modified) (1 diff)

BOOK/final-system/common/e2fsprogs.xml

@@ -64 +64 @@
           <para>This creates the shared libraries which some programs
           in this package use.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry os="e3">
+        <term><parameter>--disable-*</parameter></term>
+        <listitem>
+          <para>This prevents E2fsprogs from building and installing the
+          <systemitem class="library">libuuid</systemitem> and
+          <systemitem class="library">libblkid</systemitem> libraries, the
+          <systemitem class="daemon">uuidd</systemitem> daemon, and the
+          <command>fsck</command> wrapper, as Util-Linux installed all of
+          them earlier.</para>
         </listitem>
       </varlistentry>