Changeset 62afd55 for BOOK/final-system

Timestamp:

Jun 24, 2014, 10:06:08 AM (10 years ago)

Author:

Chris Staub <chris@…>

Branches:

clfs-3.0.0-systemd, master, systemd

Children:

b27af42

Parents:

b0c53c0

Message:

Avoid running setcap during systemd installation

Location:

BOOK/final-system

Files:

• common/systemd.xml (modified) (1 diff)
• multilib/systemd-64bit.xml (modified) (1 diff)

BOOK/final-system/common/systemd.xml

@@ -33 +33 @@
 <screen os="p2"><userinput>patch -Np1 -i ../&systemd-compat-patch;</userinput></screen>
 
-    <para os="s1">The <filename>timesyncd.conf</filename> file contains a
+    <para os="s1">Prevent the <filename>Makefile</filename> from trying to run
+    <command>setcap</command> on <command>systemd-detect-virt</command>,
+    which will fail if the kernel or file system does not support extended
+    capabilities:</para>
+
+<screen os="s2"><userinput>sed -i '/virt-install-hook /d' Makefile.in</userinput></screen>
+
+    <para os="s3">The <filename>timesyncd.conf</filename> file contains a
     reference to a non-existent <filename>timesyncd.conf(5)</filename> man
     page. Remove that reference to avoid possible confusion:</para>
 
-<screen os="s2"><userinput>sed -i '/timesyncd.conf/d' src/timesync/timesyncd.conf.in</userinput></screen>
+<screen os="s4"><userinput>sed -i '/timesyncd.conf/d' src/timesync/timesyncd.conf.in</userinput></screen>
 
     <para os="a">Prepare systemd for compilation:</para>

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

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