[Clfs-commits] [Cross-LFS]Cross-LFS Book branch, master, updated. clfs-2.1.0-1293-gb27af42

[git]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Cross-LFS Book".

The branch, master has been updated
       via  b27af42e0fab5927ad9bc0a2eab0ddf3ba762b03 (commit)
      from  62afd55a62b6fcc413b1e41c2cd056bd075ff782 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit b27af42e0fab5927ad9bc0a2eab0ddf3ba762b03
Author: Chris Staub <chris at beaker67.com>
Date:   Tue Jun 24 13:58:43 2014 -0400

    Tell systemd-fsck not to use fsck -l

diff --git a/BOOK/final-system/common/systemd.xml b/BOOK/final-system/common/systemd.xml
index 3f4dfb4..f9fcb74 100644
--- a/BOOK/final-system/common/systemd.xml
+++ b/BOOK/final-system/common/systemd.xml
@@ -45,6 +45,17 @@
 
 <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>
 
 <screen os="b"><userinput>./configure --prefix=/usr \
diff --git a/BOOK/final-system/multilib/systemd-64bit.xml b/BOOK/final-system/multilib/systemd-64bit.xml
index c70e8b2..f1c7ccc 100644
--- a/BOOK/final-system/multilib/systemd-64bit.xml
+++ b/BOOK/final-system/multilib/systemd-64bit.xml
@@ -46,6 +46,14 @@
 
     <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"
+    href="../common/systemd.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
 <screen os="b"><userinput>CC="gcc ${BUILD64}" PKG_CONFIG_PATH="${PKG_CONFIG_PATH64}" \
diff --git a/BOOK/introduction/common/changelog.xml b/BOOK/introduction/common/changelog.xml
index 4b71065..b34389e 100644
--- a/BOOK/introduction/common/changelog.xml
+++ b/BOOK/introduction/common/changelog.xml
@@ -47,6 +47,11 @@
           <para>[Chris] - Prevent systemd from running
           <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>
 

-----------------------------------------------------------------------

Summary of changes:
 BOOK/final-system/common/systemd.xml         |   11 +++++++++++
 BOOK/final-system/multilib/systemd-64bit.xml |    8 ++++++++
 BOOK/introduction/common/changelog.xml       |    5 +++++
 3 files changed, 24 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
Cross-LFS Book