Changeset c4ecc7d1

Timestamp:

03/16/2019 09:28:07 AM (6 years ago)

Author:

DJ Lucas <dj@…>

Branches:

elogind

Children:

853ae3e5

Parents:

d495d7d6

Message:

Disable systemd journal for ModemManager.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/branches/BOOK-elogind@21341 af4574ff-66df-0310-9fd7-8a98e5e911e0

Files:

• general/sysutils/modemmanager.xml (modified) (4 diffs)
• introduction/welcome/changelog.xml (modified) (1 diff)

general/sysutils/modemmanager.xml

@@ -68 +68 @@
         <para>
           Estimated build time: &ModemManager-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3" revision="sysv">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact" revision="sysv">
-      <listitem revision="sysv">
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/ModemManager-&ModemManager-version;-elogind-1.patch"/>
         </para>
       </listitem>
@@ -112 +102 @@
     <title>Installation of ModemManager</title>
 
-    <para revision="sysv">
-      Apply a patch to correct elogind detection:
-    </para>
-
-<screen revision="sysv"><userinput>patch -Np1 -i ../ModemManager-&ModemManager-version;-elogind-1.patch &amp;&amp;
-autoreconf -fi</userinput></screen>
-
     <para>
       Install <application>ModemManager</application> by running the following
@@ -124 +107 @@
     </para>
 
-<screen revision="sysv"><userinput>./configure --prefix=/usr             \
-            --sysconfdir=/etc         \
-            --localstatedir=/var      \
-            --disable-static          \
-            --enable-more-warnings=no \
-            --with-elogind-suspend-resume=yes &amp;&amp;
+<screen revision="sysv"><userinput>./configure --prefix=/usr                 \
+            --sysconfdir=/etc             \
+            --localstatedir=/var          \
+            --disable-static              \
+            --enable-more-warnings=no     \
+            --with-systemd-journal=no     \
+            --with-systemd-suspend-resume &amp;&amp;
 make</userinput></screen>
 
@@ -157 +141 @@
     <title>Command Explanations</title>
 
-    <para revision="sysv">
-      <parameter>--with-elogind-suspend-resume=yes</parameter>: This switch
-      forces <application>ModmeManager</application> to use the
-      <application>elogind</application> power management facilities.
-    </para>
-
-    <para revision="systemd">
+    <para>
       <parameter>--with-systemd-suspend-resume</parameter>: This
       switch forces <application>ModemManager</application> to use the
-      <application>systemd</application> power management facilities.
-    </para>
-
-    <para revision="systemd">
+      <phrase revision="sysv"><application>elogind</application></phrase>
+      <phrase revision="systemd"><application>systemd</application></phrase>
+      power management facilities.
+    </para>
+
+    <para>
       <parameter>--with-systemd-journal</parameter>: This switch forces
-      <application>ModemManager</application> to use the systemd journal for
+      <application>ModemManager</application>
+      <phrase revision="sysv">not</phrase> to use the systemd journal for
       logging.
     </para>

introduction/welcome/changelog.xml

@@ -33 +33 @@
       trunk</para>
       <itemizedlist>
+        <listitem revision="sysv">
+          <para>[dj] - Disable systemd journal for ModemManager.</para>
+        </listitem>
         <listitem revision="sysv">
           <para>[dj] - Remove SysV specific instructions for clutter, cogl,