Changeset 5c9e998


Ignore:
Timestamp:
06/04/2016 12:20:01 AM (6 years ago)
Author:
DJ Lucas <dj@…>
Branches:
10.0, 10.1, 11.0, 11.1, 7.10, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, lazarus, nosym, perl-modules, qt5new, trunk, upgradedb, xry111/intltool, xry111/test-20220226
Children:
3c7bd00
Parents:
39045922
Message:

Merge D-Bus changes frome systemd branch, some temporary fixes for bootscript related render errors.

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

Location:
general/sysutils
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • general/sysutils/acpid.xml

    r39045922 r5c9e998  
    150150        To automatically start <command>acpid</command> when the system is
    151151        rebooted, install the <filename>/etc/rc.d/init.d/acpid</filename>
    152         boot script from the <xref linkend="bootscripts"/> package.
     152        boot script from the <xref linkend="bootscripts" revision="sysv"/>
     153        <xref linkend="systemd-units" revision="systemd"/> package.
    153154      </para>
    154155
  • general/sysutils/at.xml

    r39045922 r5c9e998  
    150150
    151151      <para>Install the <filename>/etc/init.d/atd</filename> init script from
    152       the <xref linkend="bootscripts"/> package.</para>
     152      the <xref linkend="bootscripts" revision="sysv"/>
     153      <xref linkend="systemd-units" revision="systemd"/> package.</para>
    153154
    154155      <indexterm zone="at at-init">
  • general/sysutils/autofs.xml

    r39045922 r5c9e998  
    251251
    252252      <para>Install the <filename>/etc/init.d/autofs</filename> mount script
    253       included with the <xref linkend="bootscripts"/> package.</para>
     253      included with the <xref linkend="bootscripts" revision="sysv"/>
     254      <xref linkend="systemd-units" revision="systemd"/> package.</para>
    254255
    255256      <indexterm zone="autofs autofs-init">
  • general/sysutils/bluez.xml

    r39045922 r5c9e998  
    243243        system is rebooted, install the
    244244        <filename>/etc/rc.d/init.d/bluetooth</filename> bootscript from the
    245         <xref linkend="bootscripts"/> package.
     245        <xref linkend="bootscripts" revision="sysv"/>
     246        <xref linkend="systemd-units" revision="systemd"/> package.
    246247      </para>
    247248
  • general/sysutils/dbus.xml

    r39045922 r5c9e998  
    3030    <title>Introduction to D-Bus</title>
    3131
    32     <para>
     32    <para revision="sysv">
    3333      <application>D-Bus</application> is a message bus system, a simple way
    3434      for applications to talk to one another.
     
    4040      any two applications to communicate directly (without going through the
    4141      message bus daemon).
     42    </para>
     43
     44    <para revision="systemd">
     45      Even though <application>D-Bus</application> was built in LFS, there are
     46      some features provided by the package that other BLFS packages need, but
     47      their dependencies didn't fit into LFS.
    4248    </para>
    4349
     
    132138    </para>
    133139
    134 <screen><userinput>./configure --prefix=/usr                  \
     140<screen revision="sysv"><userinput>./configure --prefix=/usr                  \
    135141            --sysconfdir=/etc              \
    136142            --localstatedir=/var           \
     
    144150make</userinput></screen>
    145151
     152<screen revision="systemd"><userinput>./configure --prefix=/usr                  \
     153            --sysconfdir=/etc              \
     154            --localstatedir=/var           \
     155            --disable-doxygen-docs         \
     156            --disable-xml-docs             \
     157            --disable-static               \
     158            --with-console-auth-dir=/run/console/ \
     159            --docdir=/usr/share/doc/dbus-&dbus-version;   &amp;&amp;
     160make</userinput></screen>
     161
    146162    <para>
    147163      See below for test instructions.
    148164    </para>
     165
     166    <warning revision="systemd">
     167      <para>
     168        Installing the package will override all files installed by
     169        <application>D-Bus</application> in LFS. It is critical that
     170        nothing uses <application>D-Bus</application> libraries or
     171        programs during the installation phrase. Best way to achieve
     172        that is to do the installation in the rescue mode. To switch
     173        to the rescue mode, issue the following command as the
     174        <systemitem class="username">root</systemitem> user from a TTY:
     175      </para>
     176    </warning>
    149177
    150178    <para>
     
    174202
    175203<screen role="root"><userinput>dbus-uuidgen --ensure</userinput></screen>
     204
     205    <para revision="systemd">
     206      If not in chroot, at this point, you should reload the systemd daemon,
     207      and reenter multi-user mode with the following commands (as the
     208      <systemitem class="username">root</systemitem> user):
     209    </para>
     210
     211<screen role="root" revision="systemd"><userinput>systemctl daemon-reload
     212systemctl start multi-user.target</userinput></screen>
    176213
    177214    <para>
     
    243280      href="../../xincludes/static-libraries.xml"/>
    244281
    245     <para>
     282    <para revision="sysv">
    246283      <parameter>--disable-systemd</parameter>: This switch disables systemd
    247284      support in <application>D-Bus</application>.
    248285    </para>
    249286
    250     <para>
     287    <para revision="sysv">
    251288      <parameter>--without-systemdsystemunitdir</parameter>: This switch
    252289      prevents installation of systemd unit files.
     
    344381    </sect3>
    345382
    346     <sect3  id="dbus-init">
    347       <title>Boot Script</title>
    348 
    349       <para>
     383    <sect3  id="dbus-init" revision="sysv">
     384      <title>D-Bus Session Daemon</title>
     385
     386      <para revision="sysv">
    350387        To automatically start <command>dbus-daemon</command> when the
    351388        system is rebooted, install the
     
    354391      </para>
    355392
    356       <indexterm zone="dbus dbus-init">
     393      <indexterm zone="dbus dbus-init" revision="sysv">
    357394        <primary sortas="f-dbus">dbus</primary>
    358395      </indexterm>
    359396
    360 <screen role="root"><userinput>make install-dbus</userinput></screen>
    361 
    362       <para>
     397<screen role="root" revision="sysv"><userinput>make install-dbus</userinput></screen>
     398
     399      <para revision="sysv">
    363400        Note that this boot script only starts the system-wide
    364401        <application>D-Bus</application> daemon. Each user requiring access to
     
    371408      </para>
    372409
     410      <para revision="systemd">
     411        There are many methods you can use to start a session daemon
     412        using the <command>dbus-launch</command> command. Review the
     413        <command>dbus-launch</command> man page for details about the
     414        available parameters and options. Here are some suggestions and
     415        examples:
     416      </para>
     417
     418
    373419      <itemizedlist spacing="compact">
    374420        <listitem>
     
    430476  </sect2>
    431477
    432   <sect2 role="content">
     478  <sect2 role="content" revision="sysv">
    433479    <title>Contents</title>
    434480
     
    600646
    601647  </sect2>
     648 
     649  <sect2 role="content" revision="systemd">
     650    <title>Contents</title>
     651
     652      <para>
     653        A list of the installed files, along with their short
     654        descriptions can be found at
     655        <ulink url="&lfs-root;/chapter06/dbus.html#contents-dbus"/>.
     656      </para>
     657
     658  </sect2>
     659
    602660
    603661</sect1>
  • general/sysutils/fcron.xml

    r39045922 r5c9e998  
    123123    commands:</para>
    124124
    125 <screen><userinput>./configure --prefix=/usr          \
     125<screen revision="sysv"><userinput>./configure --prefix=/usr          \
    126126            --sysconfdir=/etc      \
    127127            --localstatedir=/var   \
     
    129129            --with-boot-install=no \
    130130            --with-systemdsystemunitdir=no &amp;&amp;
     131make</userinput></screen>
     132
     133<screen revision="systemd"><userinput>./configure --prefix=/usr          \
     134            --sysconfdir=/etc      \
     135            --localstatedir=/var   \
     136            --without-sendmail     \
     137            --with-boot-install=no &amp;&amp;
    131138make</userinput></screen>
    132139
     
    159166    installation of the bootscript included with the package.</para>
    160167
    161     <para><parameter>--with-systemdsystemunitdir=no|yes|DIR</parameter>: Use
    162     no, if you use sysvint; yes, if you use systemd, or specify the directory
    163     DIR for the systemd units.</para>
     168    <para revision="sysv"><parameter>--with-systemdsystemunitdir=no|yes|DIR</parameter>:
     169    Use no, if you use sysvint; yes, if you use systemd, or specify the
     170    directory for the systemd units.</para>
    164171
    165172    <para><option>--with-editor=<replaceable>&lt;/path/to/editor&gt;</replaceable></option>:
     
    230237
    231238      <para>Install the <filename>/etc/rc.d/init.d/fcron</filename>
    232       init script from the <xref linkend="bootscripts"/>
     239      init script from the <xref linkend="bootscripts" revision="sysv"/>
     240      <xref linkend="systemd-units" revision="systemd"/>
    233241      package.</para>
    234242
  • general/sysutils/gpm.xml

    r39045922 r5c9e998  
    125125
    126126      <para>Install the <filename>/etc/rc.d/init.d/gpm</filename> init script
    127       included in the <xref linkend="bootscripts"/> package.</para>
     127      included in the <xref linkend="bootscripts" revision="sysv"/>
     128      <xref linkend="systemd-units" revision="systemd"/> package.</para>
    128129
    129130<screen role="root"><userinput>make install-gpm</userinput></screen>
  • general/sysutils/sysstat.xml

    r39045922 r5c9e998  
    177177      daily data file to reinitialize the kernel counters. This can be
    178178      automated by installing the <filename>/etc/rc.d/init.d/sysstat</filename>
    179       init script included in the <xref linkend="bootscripts"/>
     179      init script included in the <xref linkend="bootscripts" revision="sysv"/>
     180      <xref linkend="systemd-units" revision="systemd"/>
    180181      package using the following command as the
    181182      <systemitem class="username">root</systemitem> user:</para>
Note: See TracChangeset for help on using the changeset viewer.