Changeset 62afd55


Ignore:
Timestamp:
Jun 24, 2014, 10:06:08 AM (8 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
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • BOOK/final-system/common/systemd.xml

    rb0c53c0 r62afd55  
    3333<screen os="p2"><userinput>patch -Np1 -i ../&systemd-compat-patch;</userinput></screen>
    3434
    35     <para os="s1">The <filename>timesyncd.conf</filename> file contains a
     35    <para os="s1">Prevent the <filename>Makefile</filename> from trying to run
     36    <command>setcap</command> on <command>systemd-detect-virt</command>,
     37    which will fail if the kernel or file system does not support extended
     38    capabilities:</para>
     39
     40<screen os="s2"><userinput>sed -i '/virt-install-hook /d' Makefile.in</userinput></screen>
     41
     42    <para os="s3">The <filename>timesyncd.conf</filename> file contains a
    3643    reference to a non-existent <filename>timesyncd.conf(5)</filename> man
    3744    page. Remove that reference to avoid possible confusion:</para>
    3845
    39 <screen os="s2"><userinput>sed -i '/timesyncd.conf/d' src/timesync/timesyncd.conf.in</userinput></screen>
     46<screen os="s4"><userinput>sed -i '/timesyncd.conf/d' src/timesync/timesyncd.conf.in</userinput></screen>
    4047
    4148    <para os="a">Prepare systemd for compilation:</para>
  • BOOK/final-system/multilib/systemd-64bit.xml

    rb0c53c0 r62afd55  
    3636    href="../common/systemd.xml"
    3737    xpointer="xpointer(//*[@os='s2'])"/>
     38
     39    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     40    href="../common/systemd.xml"
     41    xpointer="xpointer(//*[@os='s3'])"/>
     42
     43    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     44    href="../common/systemd.xml"
     45    xpointer="xpointer(//*[@os='s4'])"/>
    3846
    3947    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
  • BOOK/introduction/common/changelog.xml

    rb0c53c0 r62afd55  
    4444          from <filename>timesyncd.conf</filename>.</para>
    4545        </listitem>
     46        <listitem>
     47          <para>[Chris] - Prevent systemd from running
     48          <command>setcap</command> during installation.</para>
     49        </listitem>
    4650      </itemizedlist>
    4751    </listitem>
Note: See TracChangeset for help on using the changeset viewer.