Changeset 51dfb3e for general/sysutils


Ignore:
Timestamp:
06/27/2019 08:55:17 PM (5 years ago)
Author:
Bruce Dubbs <bdubbs@…>
Branches:
10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 9.0, 9.1, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, lazarus, lxqt, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, trunk, upgradedb, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal
Children:
ff3264f
Parents:
e77adf7
Message:

Move BLFS/trunk/BOOK and BLFS/trunk/bootscripts to
BLFS/branches/old-trunk-20190627 and BLFS/branches/old-bootscripts-20190627.

Move BLFS/branches/elogind-book and BLFS/branches/elogind-bootscripts
to trunk.

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

Location:
general/sysutils
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • general/sysutils/accountsservice.xml

    re77adf7 r51dfb3e  
    1414]>
    1515
    16 <sect1 id="accountsservice" xreflabel="AccountsService-&accountsservice-version;" revision="systemd">
     16<sect1 id="accountsservice" xreflabel="AccountsService-&accountsservice-version;">
    1717  <?dbhtml filename="accountsservice.html"?>
    1818
    … …  
    8686    <para role="recommended">
    8787      <xref linkend="gobject-introspection"/> and
    88       <xref linkend="systemd"/>
     88      <phrase revision="sysv"><xref linkend="elogind"/></phrase>
     89      <phrase revision="systemd"><xref linkend="systemd"/></phrase>
    8990    </para>
    9091
    … …  
    109110    </para>
    110111
    111 <screen><userinput>mkdir build &amp;&amp;
     112<screen revision="sysv"><userinput>mkdir build &amp;&amp;
    112113cd build &amp;&amp;
    113114
    114 meson --prefix=/usr            \
    115             -Dadmin_group=adm  \
    116             -Dsystemd=true     \
     115meson --prefix=/usr                   \
     116            -Dadmin_group=adm         \
     117            -Delogind=true            \
     118            -Dsystemdsystemunitdir=no \
     119            .. &amp;&amp;
     120ninja</userinput></screen>
     121
     122<screen revision="systemd"><userinput>mkdir build &amp;&amp;
     123cd build &amp;&amp;
     124
     125meson --prefix=/usr           \
     126            -Dadmin_group=adm \
     127            -Dsystemd=true    \
    117128            .. &amp;&amp;
    118129ninja</userinput></screen>
    … …  
    167178
    168179    <sect3 id="accountsservice-init">
    169       <title>Systemd Units</title>
    170 
    171       <para>
     180      <title><phrase revision="sysv">Boot Script</phrase>
     181             <phrase revision="systemd">Systemd Units</phrase></title>
     182
     183      <para revision="sysv">
    172184        To start the <command>accounts-daemon</command> daemon at boot,
    173         enable the previously installed systemd unit by
    174         running the following command as the
     185        install the
     186        <filename>/etc/rc.d/init.d/accounts-daemon</filename> init script from
     187        the <xref linkend="bootscripts"/> package
     188        by running the following command as the
     189        <systemitem class="username">root</systemitem> user:
     190      </para>
     191
     192      <para revision="systemd">
     193        To start the <command>accounts-daemon</command> daemon at boot,
     194        enable the previously installed systemd unit
     195        by running the following command as the
    175196        <systemitem class="username">root</systemitem> user:
    176197      </para>
    … …  
    180201      </indexterm>
    181202
    182 <screen role="root"><userinput>systemctl enable accounts-daemon</userinput></screen>
     203<screen role="root" revision="sysv"><userinput>make install-accounts-daemon</userinput></screen>
     204
     205<screen role="root" revision="systemd"><userinput>systemctl enable accounts-daemon</userinput></screen>
    183206
    184207    </sect3>

  • general/sysutils/cups-pk-helper.xml

    re77adf7 r51dfb3e  
    1414]>
    1515
    16 <sect1 id="cups-pk-helper" xreflabel="cups-pk-helper-&cups-pk-helper-version;" revision="systemd">
     16<sect1 id="cups-pk-helper" xreflabel="cups-pk-helper-&cups-pk-helper-version;">
    1717  <?dbhtml filename="cups-pk-helper.html"?>
    1818

  • general/sysutils/dbus.xml

    re77adf7 r51dfb3e  
    9292    </para>
    9393
     94
    9495    <bridgehead renderas="sect4">Recommended</bridgehead>
    9596    <para role="recommended">
    9697      <xref linkend="xorg7-lib"/> (for <command>dbus-launch</command> program)
     98      <phrase revision="sysv"><xref linkend="elogind"/> (first build
     99      without, and then again after elogind is installed)</phrase>
    97100    </para>
    98101
    … …  
    142145            --sysconfdir=/etc                    \
    143146            --localstatedir=/var                 \
     147            --enable-user-session                \
    144148            --disable-doxygen-docs               \
    145149            --disable-xml-docs                   \
    146150            --disable-static                     \
     151            --with-systemduserunitdir=no         \
     152            --with-systemdsystemunitdir=no       \
    147153            --docdir=/usr/share/doc/dbus-&dbus-version; \
    148154            --with-console-auth-dir=/run/console \
    … …  
    189195<screen role="root"><userinput>make install</userinput></screen>
    190196
    191     <para revision="systemd">
     197    <para>
    192198      The shared library needs to be moved to
    193199      <filename class="directory">/lib</filename>, and as a result the
    … …  
    198204    </para>
    199205
    200 <screen revision="systemd" role="root"><userinput>mv -v /usr/lib/libdbus-1.so.* /lib &amp;&amp;
     206<screen role="root"><userinput>mv -v /usr/lib/libdbus-1.so.* /lib &amp;&amp;
    201207ln -sfv ../../lib/$(readlink /usr/lib/libdbus-1.so) /usr/lib/libdbus-1.so</userinput></screen>
    202208
    … …  
    222228<screen role="root" revision="sysv"><userinput>dbus-uuidgen --ensure</userinput></screen>
    223229
     230    <para revision="sysv">
     231      If using <xref linkend="elogind"/>, create a symlink to the
     232      <filename>/var/lib/dbus/machine-id</filename> file:
     233    </para>
     234
     235<screen role="root" revision="sysv"><userinput>ln -sv /var/lib/dbus/machine-id /etc</userinput></screen>
     236
    224237    <para revision="systemd">
    225238      If not in chroot, at this point, you should reload the systemd daemon,
    … …  
    286299      href="../../xincludes/static-libraries.xml"/>
    287300
     301    <para>
     302      <parameter>--enable-user-session</parameter>: This parameter enables
     303      per-user DBus sessions with
     304      <phrase revision="sysv"><application>elogind</application>.</phrase>
     305      <phrase revision="systemd"><application>systemd</application>.</phrase>
     306    </para>
     307
    288308    <para revision="sysv">
    289       <parameter>--disable-systemd</parameter>: This switch disables systemd
    290       support in <application>D-Bus</application>.
    291     </para>
    292 
    293     <para revision="sysv">
    294       <parameter>--without-systemdsystemunitdir</parameter>: This switch
    295       prevents installation of systemd unit files.
    296     </para>
    297 
    298     <para revision="systemd">
    299       <parameter>--enable-user-session</parameter>: This parameter enables
    300       per-user DBus sessions with <application>systemd</application>.
    301     </para>
    302 
     309      <parameter>--with-systemd{user,system}unitdir=</parameter>: These
     310      switches disable installation of systemd units on elogind based systems.
     311    </para>
    303312    <para>
    304313      <parameter>--with-console-auth-dir=/run/console/</parameter>: This

  • general/sysutils/fcron.xml

    re77adf7 r51dfb3e  
    241241
    242242<screen role="root"><userinput>cat &gt; /usr/bin/run-parts &lt;&lt; "EOF" &amp;&amp;
    243 #!/bin/sh
     243<literal>#!/bin/sh
    244244# run-parts:  Runs all the scripts found in a directory.
    245245# from Slackware, by Patrick J. Volkerding with ideas borrowed
    … …  
    288288done
    289289
    290 exit 0
     290exit 0</literal>
    291291EOF
    292292chmod -v 755 /usr/bin/run-parts</userinput></screen>
    … …  
    305305
    306306<screen role="root"><userinput>cat &gt; /var/spool/fcron/systab.orig &lt;&lt; "EOF"
    307 &amp;bootrun 01 * * * * root run-parts /etc/cron.hourly
     307<literal>&amp;bootrun 01 * * * * root run-parts /etc/cron.hourly
    308308&amp;bootrun 02 4 * * * root run-parts /etc/cron.daily
    309309&amp;bootrun 22 4 * * 0 root run-parts /etc/cron.weekly
    310 &amp;bootrun 42 4 1 * * root run-parts /etc/cron.monthly
     310&amp;bootrun 42 4 1 * * root run-parts /etc/cron.monthly</literal>
    311311EOF</userinput></screen>
    312312

  • general/sysutils/logrotate.xml

    re77adf7 r51dfb3e  
    126126
    127127<screen role="root"><userinput>cat &gt; /etc/logrotate.conf &lt;&lt; EOF
    128 # Begin of /etc/logrotate.conf
     128<literal># Begin of /etc/logrotate.conf
    129129
    130130# Rotate log files weekly
    … …  
    165165include /etc/logrotate.d
    166166
    167 # End of /etc/logrotate.conf
     167# End of /etc/logrotate.conf</literal>
    168168EOF
    169169
    … …  
    180180
    181181<screen role="root"><userinput>cat &gt; /etc/logrotate.d/sys.log &lt;&lt; EOF
    182 /var/log/sys.log {
     182<literal>/var/log/sys.log {
    183183   # If the log file is larger than 100kb, rotate it
    184184   size   100k
    … …  
    188188      /bin/killall -HUP syslogd
    189189   endscript
    190 }
     190}</literal>
    191191EOF
    192192
    … …  
    196196
    197197<screen role="root"><userinput>cat &gt; /etc/logrotate.d/example.log &lt;&lt; EOF
    198 file1
     198<literal>file1
    199199file2
    200200file3 {
    … …  
    203203    ...
    204204   endscript
    205 }
     205}</literal>
    206206EOF
    207207

  • general/sysutils/modemmanager.xml

    re77adf7 r51dfb3e  
    8181    <bridgehead renderas="sect4">Recommended</bridgehead>
    8282    <para role="recommended">
     83      <phrase revision="sysv"><xref linkend="elogind"/>,</phrase>
    8384      <xref linkend="gobject-introspection"/>,
    8485      <xref linkend="libmbim"/>,
    … …  
    106107    </para>
    107108
    108 <screen revision="sysv"><userinput>./configure --prefix=/usr        \
    109             --sysconfdir=/etc    \
    110             --localstatedir=/var \
    111             --enable-more-warnings=no \
    112             --disable-static     &amp;&amp;
     109<screen revision="sysv"><userinput>./configure --prefix=/usr                 \
     110            --sysconfdir=/etc             \
     111            --localstatedir=/var          \
     112            --disable-static              \
     113            --enable-more-warnings=no     \
     114            --with-systemd-journal=no     \
     115            --with-systemd-suspend-resume &amp;&amp;
    113116make</userinput></screen>
    114117
    … …  
    138141    <title>Command Explanations</title>
    139142
    140     <para revision="systemd">
     143    <para>
    141144      <parameter>--with-systemd-suspend-resume</parameter>: This
    142       switch forces <application>ModemManager</application> to use the systemd
     145      switch forces <application>ModemManager</application> to use the
     146      <phrase revision="sysv"><application>elogind</application></phrase>
     147      <phrase revision="systemd"><application>systemd</application></phrase>
    143148      power management facilities.
    144149    </para>
    145150
    146     <para revision="systemd">
     151    <para>
    147152      <parameter>--with-systemd-journal</parameter>: This switch forces
    148       <application>ModemManager</application> to use the systemd journal for
     153      <application>ModemManager</application>
     154      <phrase revision="sysv">not</phrase> to use the systemd journal for
    149155      logging.
    150156    </para>

  • general/sysutils/sysutils.xml

    re77adf7 r51dfb3e  
    3535
    3636  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dbus.xml"/>
     37
     38  <!-- sysv only -->
     39  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="elogind.xml"/>
     40
    3741  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="fcron.xml"/>
    3842  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gpm.xml"/>
Note: See TracChangeset for help on using the changeset viewer.