Changeset b27af42 for BOOK

Timestamp:

Jun 24, 2014, 10:58:43 AM (11 years ago)

Author:

Chris Staub <chris@…>

Branches:

clfs-3.0.0-systemd, master, systemd

Children:

7db0c2e

Parents:

62afd55

Message:

Tell systemd-fsck not to use fsck -l

Location:

BOOK

Files:

• final-system/common/systemd.xml (modified) (1 diff)
• final-system/multilib/systemd-64bit.xml (modified) (1 diff)
• introduction/common/changelog.xml (modified) (1 diff)

BOOK/final-system/common/systemd.xml

@@ -45 +45 @@
 
 <screen os="s4"><userinput>sed -i '/timesyncd.conf/d' src/timesync/timesyncd.conf.in</userinput></screen>
+
+    <para os="s5">By default, <command>systemd-fsck</command> will run
+    <filename>/sbin/fsck</filename> with the <option>-l</option> option, which
+    applies an <function>flock</function> on the file system being checked.
+    This can conflict with an <function>flock</function> that
+    systemd itself puts on the file system, which could result in problems
+    booting. <command>fsck</command> will be fixed to avoid this problem in a
+    future release of Util-linux, but for now we will work around the issue by
+    simply preventing <command>systemd-fsck</command> from using <option>-l</option>:</para>
+
+<screen os="s6"><userinput>sed -i '/-l/d' src/fsck/fsck.c</userinput></screen>
 
     <para os="a">Prepare systemd for compilation:</para>

BOOK/final-system/multilib/systemd-64bit.xml

@@ -44 +44 @@
     href="../common/systemd.xml"
     xpointer="xpointer(//*[@os='s4'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/systemd.xml"
+    xpointer="xpointer(//*[@os='s5'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/systemd.xml"
+    xpointer="xpointer(//*[@os='s6'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

BOOK/introduction/common/changelog.xml

@@ -48 +48 @@
           <command>setcap</command> during installation.</para>
         </listitem>
+        <listitem>
+          <para>[Chris] - Prevent <command>systemd-fsck</command> from using
+          <command>fsck -l</command>, to avoid boot errors. Fixes ticket
+          <ulink url="http://trac.cross-lfs.org/ticket/968">#968</ulink>.</para>
+        </listitem>
       </itemizedlist>
     </listitem>