Changeset 51dfb3e


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, 12.2, 9.0, 9.1, gimp3, 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/for-12.3, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/spidermonkey128, 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

Files:
88 edited

Legend:

Unmodified
Added
Removed

  • archive/gnome/caribou-new.xml

    re77adf7 r51dfb3e  
    1313]>
    1414
    15 <sect1 id="caribou" xreflabel="Caribou-&caribou-version;" revision="systemd">
     15<sect1 id="caribou" xreflabel="Caribou-&caribou-version;">
    1616  <?dbhtml filename="caribou.html"?>
    1717

  • archive/w3m.xml

    re77adf7 r51dfb3e  
    1717
    1818  <sect1info>
    19     <othername>$LastChangedBy: pierre $</othername>
    20     <date>$Date: 2019-02-15 22:01:29 +0100 (ven. 15 févr. 2019) $</date>
     19    <othername>$LastChangedBy: dj $</othername>
     20    <date>$Date: 2019-06-09 07:27:41 -0500 (Sun, 09 Jun 2019) $</date>
    2121  </sect1info>
    2222

  • general.ent

    re77adf7 r51dfb3e  
    66<!ENTITY copyrightdate "2001-&year;">
    77<!ENTITY copyholder   "The BLFS Development Team">
    8 <!ENTITY version      "&year;-&month;-&day;">
     8<!ENTITY version      "&year;-&month;-&day; System V">
    99<!ENTITY releasedate  "June 27th, &year;">
    1010<!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
    … …  
    8383<!-- End LFS versions -->
    8484
    85 <!ENTITY blfs-bootscripts-version     "20190524">
     85<!ENTITY blfs-bootscripts-version     "20190609">
    8686<!ENTITY systemd-units-version        "20180105">
    8787

  • general/genlib/libatasmart.xml

    re77adf7 r51dfb3e  
    149149        <listitem>
    150150          <para>
    151             is a utility to issue disk tests.
     151            is a utility to issue disks tests.
    152152          </para>
    153153          <indexterm zone="libatasmart sktest">

  • general/genlib/libbytesize.xml

    re77adf7 r51dfb3e  
    146146          /usr/include/bytesize,
    147147          /usr/share/gtk-doc/html/libbytesize, and
    148           /usr/lib/python{2.7,3.7}/site-packages/bytesize
     148          /usr/lib/python{2.7,3.6}/site-packages/bytesize
    149149        </seg>
    150150      </seglistitem>

  • general/genlib/libpaper.xml

    re77adf7 r51dfb3e  
    100100
    101101cat &gt; /usr/bin/run-parts &lt;&lt; "EOF"
    102 #!/bin/sh
     102<literal>#!/bin/sh
    103103# run-parts:  Runs all the scripts found in a directory.
    104104# from Slackware, by Patrick J. Volkerding with ideas borrowed
    … …  
    147147done
    148148
    149 exit 0
     149exit 0</literal>
    150150EOF
    151151
    … …  
    185185
    186186<screen role="root"><userinput>cat &gt; /etc/papersize &lt;&lt; "EOF"
    187 a4
     187<literal>a4</literal>
    188188EOF</userinput></screen>
    189189

  • general/genlib/libwacom.xml

    re77adf7 r51dfb3e  
    1313]>
    1414
    15 <sect1 id="libwacom" xreflabel="libwacom-&libwacom-version;" revision="systemd">
     15<sect1 id="libwacom" xreflabel="libwacom-&libwacom-version;">
    1616  <?dbhtml filename="libwacom.html"?>
    1717

  • general/genlib/telepathy-glib.xml

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

  • general/genutils/bogofilter.xml

    re77adf7 r51dfb3e  
    1313]>
    1414
    15 <sect1 id="bogofilter" xreflabel="Bogofilter-&bogofilter-version;" revision="systemd">
     15<sect1 id="bogofilter" xreflabel="Bogofilter-&bogofilter-version;">
    1616  <?dbhtml filename="bogofilter.html"?>
    1717

  • general/genutils/telepathy-mission-control.xml

    re77adf7 r51dfb3e  
    1414]>
    1515
    16 <sect1 id="telepathy-mission-control" xreflabel="telepathy-mission-control-&telepathy-mission-control-version;" revision="systemd">
     16<sect1 id="telepathy-mission-control" xreflabel="telepathy-mission-control-&telepathy-mission-control-version;">
    1717  <?dbhtml filename="telepathy-mission-control.html"?>
    1818
    … …  
    124124  <sect2 role="commands">
    125125    <title>Command Explanations</title>
     126
     127<!--
     128    <para>
     129      <parameter>- -disable-upower</parameter> This switch
     130      disables the use of <application>UPower</application>
     131      because <application>Telepathy Mission Control</application>
     132      fails to build with latest version.
     133    </para>
     134As far as I can tell, this is no longer needed as of 5.16.4. -renodr
     135-->
    126136
    127137    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    … …  
    176186        <listitem>
    177187          <para>
    178             waits for a D-Bus bus name that will be provided
     188            waits for a (D-Bus) bus name that will (after a while) be provided
    179189            automatically by the desktop session.
    180190          </para>

  • general/prog/rust.xml

    re77adf7 r51dfb3e  
    227227
    228228<screen><userinput>cat &lt;&lt; EOF &gt; config.toml
    229 # see config.toml.example for more possible options
     229<literal># see config.toml.example for more possible options
    230230[llvm]
    231231
    … …  
    263263# get a trace if there is an Internal Compiler Exception
    264264backtrace-on-ice = true
    265 
     265</literal>
    266266EOF</userinput></screen>
    267267

  • 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"/>

  • gnome.ent

    re77adf7 r51dfb3e  
    3434<!ENTITY gnome-video-effects-version       "0.4.3">
    3535<!ENTITY grilo-version                     "0.3.7">
    36 <!ENTITY libchamplain-version              "0.12.19">
    37 <!ENTITY libgdata-version                  "0.17.10">
     36<!ENTITY libchamplain-version              "0.12.16">
     37<!ENTITY libgdata-version                  "0.17.9">
    3838<!ENTITY libgee-version                    "0.20.1">
    3939<!ENTITY libgtop-version                   "2.40.0">

  • gnome/applications/applications.xml

    re77adf7 r51dfb3e  
    2222  </para>
    2323
    24 <!--
    25   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dummy-apps.xml"/>
    26 -->
    2724  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="baobab.xml"/>
    2825  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="brasero.xml"/>

  • gnome/applications/evolution.xml

    re77adf7 r51dfb3e  
    1313]>
    1414
    15 <sect1 id="evolution" xreflabel="Evolution-&evolution-version;" revision="systemd">
     15<sect1 id="evolution" xreflabel="Evolution-&evolution-version;">
    1616  <?dbhtml filename="evolution.html" ?>
    1717

  • gnome/applications/gnome-color-manager.xml

    re77adf7 r51dfb3e  
    1515]>
    1616
    17 <sect1 id="gnome-color-manager" xreflabel="gnome-color-manager-&gnome-color-manager-version;" revision="systemd">
     17<sect1 id="gnome-color-manager" xreflabel="gnome-color-manager-&gnome-color-manager-version;">
    1818  <?dbhtml filename="gnome-color-manager.html"?>
    1919

  • gnome/applications/gnome-disk-utility.xml

    re77adf7 r51dfb3e  
    1515]>
    1616
    17 <sect1 id="gnome-disk-utility" xreflabel="gnome-disk-utility-&gnome-disk-utility-version;" revision="systemd">
     17<sect1 id="gnome-disk-utility" xreflabel="gnome-disk-utility-&gnome-disk-utility-version;">
    1818  <?dbhtml filename="gnome-disk-utility.html"?>
    1919

  • gnome/applications/gnome-logs.xml

    re77adf7 r51dfb3e  
    1515]>
    1616
    17 <sect1 id="gnome-logs" xreflabel="gnome-logs-&gnome-logs-version;" revision="systemd">
     17<sect1 id="gnome-logs" xreflabel="gnome-logs-&gnome-logs-version;">
    1818  <?dbhtml filename="gnome-logs.html"?>
    1919

  • gnome/applications/gnome-maps.xml

    re77adf7 r51dfb3e  
    1515]>
    1616
    17 <sect1 id="gnome-maps" xreflabel="gnome-maps-&gnome-maps-version;" revision="systemd">
     17<sect1 id="gnome-maps" xreflabel="gnome-maps-&gnome-maps-version;">
    1818  <?dbhtml filename="gnome-maps.html"?>
    1919

  • gnome/applications/gnome-power-manager.xml

    re77adf7 r51dfb3e  
    1515]>
    1616
    17 <sect1 id="gnome-power-manager" xreflabel="gnome-power-manager-&gnome-power-manager-version;" revision="systemd">
     17<sect1 id="gnome-power-manager" xreflabel="gnome-power-manager-&gnome-power-manager-version;">
    1818  <?dbhtml filename="gnome-power-manager.html"?>
    1919

  • gnome/applications/gnome-tweaks.xml

    re77adf7 r51dfb3e  
    1515]>
    1616
    17 <sect1 id="gnome-tweaks" xreflabel="gnome-tweaks-&gnome-tweaks-version;" revision="systemd">
     17<sect1 id="gnome-tweaks" xreflabel="gnome-tweaks-&gnome-tweaks-version;">
    1818  <?dbhtml filename="gnome-tweaks.html"?>
    1919

  • gnome/applications/gnome-weather.xml

    re77adf7 r51dfb3e  
    1515]>
    1616
    17 <sect1 id="gnome-weather" xreflabel="gnome-weather-&gnome-weather-version;" revision="systemd">
     17<sect1 id="gnome-weather" xreflabel="gnome-weather-&gnome-weather-version;">
    1818  <?dbhtml filename="gnome-weather.html"?>
    1919

  • gnome/applications/network-manager-applet.xml

    re77adf7 r51dfb3e  
    100100
    101101    <bridgehead renderas="sect4">Optional</bridgehead>
    102     <para role="optional" revision="sysv">
    103       <xref linkend="gc"/> (for linker garbage collection),
    104       <xref linkend="gtk-doc"/>,
    105       <xref linkend="jansson"/>,
    106       <ulink url="&gnome-download-http;/gnome-bluetooth/">
    107         GNOME Bluetooth</ulink>, and
    108       <ulink url="&gnome-download-http;/mobile-broadband-provider-info">
    109         mobile-broadband-provider-info</ulink> (runtime)
    110     </para>
    111     <para role="optional" revision="systemd">
     102    <para role="optional">
    112103      <xref linkend="gc"/> (for linker garbage collection),
    113104      <xref linkend="gnome-bluetooth"/>,

  • gnome/applications/vinagre.xml

    re77adf7 r51dfb3e  
    1313]>
    1414
    15 <sect1 id="vinagre" xreflabel="Vinagre-&vinagre-version;" revision="systemd">
     15<sect1 id="vinagre" xreflabel="Vinagre-&vinagre-version;">
    1616  <?dbhtml filename="vinagre.html"?>
    1717

  • gnome/applications/vino.xml

    re77adf7 r51dfb3e  
    1313]>
    1414
    15 <sect1 id="vino" xreflabel="Vino-&vino-version;" revision="systemd">
     15<sect1 id="vino" xreflabel="Vino-&vino-version;">
    1616  <?dbhtml filename="vino.html"?>
    1717

  • gnome/gnome.xml

    re77adf7 r51dfb3e  
    1414  <?dbhtml filename="gnome.html" dir="gnome"?>
    1515
    16   <title><phrase revision="sysv">Selected GNOME Applications</phrase>
    17          <phrase revision="systemd">GNOME</phrase></title>
     16  <title>GNOME</title>
    1817
    1918<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-intro.xml"/> -->

  • gnome/platform/evolution-data-server.xml

    re77adf7 r51dfb3e  
    1616
    1717<sect1 id="evolution-data-server"
    18 xreflabel="evolution-data-server-&evolution-data-server-version;" revision="systemd">
     18xreflabel="evolution-data-server-&evolution-data-server-version;">
    1919  <?dbhtml filename="evolution-data-server.html"?>
    2020

  • gnome/platform/folks.xml

    re77adf7 r51dfb3e  
    1313]>
    1414
    15 <sect1 id="folks" xreflabel="Folks-&folks-version;" revision="systemd">
     15<sect1 id="folks" xreflabel="Folks-&folks-version;">
    1616  <?dbhtml filename="folks.html"?>
    1717
    … …  
    113113
    114114<screen><userinput>mkdir build &amp;&amp;
    115 cd    build &amp;&amp;
     115cd build &amp;&amp;
    116116
    117117meson --prefix=/usr --sysconfdir=/etc .. &amp;&amp;

  • gnome/platform/gdm.xml

    re77adf7 r51dfb3e  
    1313]>
    1414
    15 <sect1 id="gdm" xreflabel="GDM-&gdm-version;" revision="systemd">
     15<sect1 id="gdm" xreflabel="GDM-&gdm-version;">
    1616  <?dbhtml filename="gdm.html"?>
    1717
    … …  
    100100      <xref role="runtime" linkend="gnome-session"/>,
    101101      <xref role="runtime" linkend="gnome-shell"/>, and
    102       <xref role="runtime" linkend="systemd"/>
     102      <phrase revision="sysv"><xref role="runtime" linkend="elogind"/></phrase>
     103      <phrase revision="systemd"><xref role="runtime" linkend="systemd"/></phrase>
    103104    </para>
    104105
    … …  
    128129    </para>
    129130
    130 <screen><userinput>./configure --prefix=/usr         \
     131<screen revision="sysv"><userinput>sed 's@systemd@elogind@' -i data/pam-lfs/gdm-launch-environment.pam &amp;&amp;
     132
     133./configure --prefix=/usr         \
     134            --sysconfdir=/etc     \
     135            --localstatedir=/var  \
     136            --without-plymouth    \
     137            --disable-static      \
     138            --enable-gdm-xsession \
     139            --with-systemdsystemunitdir=no \
     140            --with-pam-mod-dir=/lib/security &amp;&amp;
     141make</userinput></screen>
     142
     143<screen revision="systemd"><userinput>./configure --prefix=/usr         \
    131144            --sysconfdir=/etc     \
    132145            --localstatedir=/var  \
    … …  
    145158    </para>
    146159
    147 <screen role="root"><userinput>make install &amp;&amp;
     160<screen role="root" revision="sysv"><userinput>make install</userinput></screen>
     161
     162<screen role="root" revision="systemd"><userinput>make install &amp;&amp;
    148163install -v -m644 data/gdm.service /lib/systemd/system/gdm.service</userinput></screen>   
    149164
    … …  
    214229
    215230    <sect3 id="gdm-init">
    216       <title>Systemd Units</title>
    217 
    218       <para>
     231      <title><phrase revision="sysv">Boot Script</phrase>
     232             <phrase revision="systemd">Systemd Unit</phrase></title>
     233
     234      <para revision="sysv">
     235        To start the <command>gdm</command> automatically when the system
     236        is booted, install the <filename>/etc/rc.d/init.d/gdm</filename>
     237        init script included in the <xref linkend="bootscripts"/> package and
     238        set the default runlevel to 5 (graphical login) as the
     239        <systemitem class="username">root</systemitem> user:
     240      </para>
     241
     242      <para revision="systemd">
    219243        To start the <command>gdm</command> daemon at boot, enable
    220244        the previously installed systemd unit by running the following command
    … …  
    226250      </indexterm>
    227251
    228 <screen role="root"><userinput>systemctl enable gdm</userinput></screen>
     252      <para revision="sysv">
     253        In order to permanently set the default to 5, starting the
     254        <command>gdm</command> greeter screen automatically, you can modify
     255        <filename>/etc/inittab</filename>. As the  <systemitem
     256        class="username">root</systemitem> user:
     257      </para>
     258
     259<screen role="root" revision="sysv"><userinput>make install-gdm &amp;&amp;
     260sed /initdefault/s/3/5/ -i /etc/inittab</userinput></screen>
     261
     262      <para revision="sysv">
     263          You should also disable default elogind power management:
     264      </para>
     265
     266<screen role="root" revision="sysv"><userinput>cat &gt;&gt; /etc/elogind/logind.conf &lt;&lt; "EOF"
     267<literal>AllowSuspend=no
     268AllowHibernation=no</literal>
     269EOF</userinput></screen>
     270
     271<screen role="root" revision="systemd"><userinput>systemctl enable gdm</userinput></screen>
    229272
    230273    </sect3>

  • gnome/platform/geocode-glib.xml

    re77adf7 r51dfb3e  
    1515]>
    1616
    17 <sect1 id="geocode-glib" xreflabel="geocode-glib-&geocode-glib-version;" revision="systemd">
     17<sect1 id="geocode-glib" xreflabel="geocode-glib-&geocode-glib-version;">
    1818  <?dbhtml filename="geocode-glib.html"?>
    1919

  • gnome/platform/gfbgraph.xml

    re77adf7 r51dfb3e  
    1313]>
    1414
    15 <sect1 id="gfbgraph" xreflabel="gfbgraph-&gfbgraph-version;" revision="systemd">
     15<sect1 id="gfbgraph" xreflabel="gfbgraph-&gfbgraph-version;">
    1616  <?dbhtml filename="gfbgraph.html"?>
    1717

  • gnome/platform/gjs.xml

    re77adf7 r51dfb3e  
    8181    </para>
    8282
    83     <bridgehead revision="systemd" renderas="sect4">Recommended (required for GNOME)</bridgehead>
    84     <para role="recommended" revision="systemd">
     83    <bridgehead renderas="sect4">Recommended (required for GNOME)</bridgehead>
     84    <para role="recommended">
    8585      <xref linkend="gtk3"/>
    8686    </para>

  • gnome/platform/gnome-backgrounds.xml

    re77adf7 r51dfb3e  
    1515]>
    1616
    17 <sect1 id="gnome-backgrounds" xreflabel="gnome-backgrounds-&gnome-backgrounds-version;" revision="systemd">
     17<sect1 id="gnome-backgrounds" xreflabel="gnome-backgrounds-&gnome-backgrounds-version;">
    1818  <?dbhtml filename="gnome-backgrounds.html"?>
    1919

  • gnome/platform/gnome-bluetooth.xml

    re77adf7 r51dfb3e  
    1515]>
    1616
    17 <sect1 id="gnome-bluetooth" xreflabel="gnome-bluetooth-&gnome-bluetooth-version;" revision="systemd">
     17<sect1 id="gnome-bluetooth" xreflabel="gnome-bluetooth-&gnome-bluetooth-version;">
    1818  <?dbhtml filename="gnome-bluetooth.html"?>
    1919
    … …  
    9797    <para role="optional">
    9898      <xref role="runtime" linkend="bluez"/> and
    99       <xref role="runtime" linkend="systemd"/>
     99      <phrase revision="sysv"><xref role="runtime" linkend="elogind"/></phrase>
     100      <phrase revision="systemd"><xref role="runtime" linkend="systemd"/></phrase>
    100101    </para>
    101102

  • gnome/platform/gnome-control-center.xml

    re77adf7 r51dfb3e  
    1515]>
    1616
    17 <sect1 id="gnome-control-center" xreflabel="gnome-control-center-&gnome-control-center-version;" revision="systemd">
     17<sect1 id="gnome-control-center" xreflabel="gnome-control-center-&gnome-control-center-version;">
    1818  <?dbhtml filename="gnome-control-center.html"?>
    1919

  • gnome/platform/gnome-menus.xml

    re77adf7 r51dfb3e  
    1515]>
    1616
    17 <sect1 id="gnome-menus" xreflabel="gnome-menus-&gnome-menus-version;" revision="systemd">
     17<sect1 id="gnome-menus" xreflabel="gnome-menus-&gnome-menus-version;">
    1818  <?dbhtml filename="gnome-menus.html"?>
    1919

  • gnome/platform/gnome-online-accounts.xml

    re77adf7 r51dfb3e  
    1515]>
    1616
    17 <sect1 id="gnome-online-accounts" xreflabel="gnome-online-accounts-&gnome-online-accounts-version;" revision="systemd">
     17<sect1 id="gnome-online-accounts" xreflabel="gnome-online-accounts-&gnome-online-accounts-version;">
    1818  <?dbhtml filename="gnome-online-accounts.html"?>
    1919

  • gnome/platform/gnome-session.xml

    re77adf7 r51dfb3e  
    1515]>
    1616
    17 <sect1 id="gnome-session" xreflabel="gnome-session-&gnome-session-version;" revision="systemd">
     17<sect1 id="gnome-session" xreflabel="gnome-session-&gnome-session-version;">
    1818  <?dbhtml filename="gnome-session.html"?>
    1919
    … …  
    7878    <para role="required">
    7979      <xref linkend="dbus-glib"/>,
     80      <phrase revision="sysv"><xref role="runtime" linkend="elogind"/>,</phrase>
    8081      <xref linkend="gnome-desktop"/>,
    8182      <xref linkend="json-glib"/>,
    8283      <xref linkend="mesa"/>,
    83       <xref linkend="systemd"/>,
     84      <phrase revision="systemd"><xref role="runtime" linkend="systemd"/>,</phrase>
    8485      and <xref linkend="upower"/>
    8586    </para>
    … …  
    118119    </para>
    119120
    120 <screen><userinput>mkdir build &amp;&amp;
     121<screen revision="sysv"><userinput>mkdir build &amp;&amp;
     122cd    build &amp;&amp;
     123
     124meson --prefix=/usr           \
     125      -Dsystemd_journal=false \
     126      .. &amp;&amp;
     127ninja</userinput></screen>
     128
     129<screen revision="systemd"><userinput>mkdir build &amp;&amp;
    121130cd    build &amp;&amp;
    122131

  • gnome/platform/gnome-settings-daemon.xml

    re77adf7 r51dfb3e  
    1515]>
    1616
    17 <sect1 id="gnome-settings-daemon" xreflabel="gnome-settings-daemon-&gnome-settings-daemon-version;" revision="systemd">
     17<sect1 id="gnome-settings-daemon" xreflabel="gnome-settings-daemon-&gnome-settings-daemon-version;">
    1818  <?dbhtml filename="gnome-settings-daemon.html"?>
    1919
    … …  
    8989      <xref linkend="libwacom"/>,
    9090      <xref linkend="pulseaudio"/>,
    91       <xref linkend="systemd"/>,
     91      <phrase revision="sysv"><xref linkend="elogind"/>,</phrase>
     92      <phrase revision="systemd"><xref linkend="systemd"/>,</phrase>
    9293      <xref linkend="upower"/>, and
    9394      <xref linkend="xorg-wacom-driver"/>

  • gnome/platform/gnome-shell-extensions.xml

    re77adf7 r51dfb3e  
    1515]>
    1616
    17 <sect1 id="gnome-shell-extensions" xreflabel="gnome-shell-extensions-&gnome-shell-extensions-version;" revision="systemd">
     17<sect1 id="gnome-shell-extensions" xreflabel="gnome-shell-extensions-&gnome-shell-extensions-version;">
    1818  <?dbhtml filename="gnome-shell-extensions.html"?>
    1919

  • gnome/platform/gnome-shell.xml

    re77adf7 r51dfb3e  
    1515]>
    1616
    17 <sect1 id="gnome-shell" xreflabel="gnome-shell-&gnome-shell-version;" revision="systemd">
     17<sect1 id="gnome-shell" xreflabel="gnome-shell-&gnome-shell-version;">
    1818  <?dbhtml filename="gnome-shell.html"?>
    1919
    … …  
    8484      <xref linkend="sassc"/>,
    8585      <xref linkend="startup-notification"/>, and
    86       <xref linkend="systemd"/>
     86      <phrase revision="sysv"><xref linkend="elogind"/></phrase>
     87      <phrase revision="systemd"><xref linkend="systemd"/></phrase>
    8788    </para>
    8889

  • gnome/platform/gnome-user-docs.xml

    re77adf7 r51dfb3e  
    1515]>
    1616
    17 <sect1 id="gnome-user-docs" xreflabel="gnome-user-docs-&gnome-user-docs-version;" revision="systemd">
     17<sect1 id="gnome-user-docs" xreflabel="gnome-user-docs-&gnome-user-docs-version;">
    1818  <?dbhtml filename="gnome-user-docs.html"?>
    1919

  • gnome/platform/grilo.xml

    re77adf7 r51dfb3e  
    1313]>
    1414
    15 <sect1 id="grilo" xreflabel="Grilo-&grilo-version;" revision="systemd">
     15<sect1 id="grilo" xreflabel="Grilo-&grilo-version;">
    1616  <?dbhtml filename="grilo.html"?>
    1717
    … …  
    9595
    9696<screen><userinput>mkdir build &amp;&amp;
    97 cd    build &amp;&amp;
    98 
    99 meson --prefix=/usr            \
     97cd build    &amp;&amp;
     98meson --prefix=/usr \
    10099      --libexecdir=/usr/lib .. &amp;&amp;
    101100ninja</userinput></screen>

  • gnome/platform/gvfs.xml

    re77adf7 r51dfb3e  
    8484
    8585    <bridgehead renderas="sect4">Recommended</bridgehead>
    86     <para role="recommended" revision="sysv">
    87       <xref linkend="gcr"/>,
    88       <xref linkend="gtk3"/>,
    89       <xref linkend="libcdio"/>,
    90       <xref linkend="libgudev"/> and
    91       <xref linkend="udisks2"/>
    92     </para>
    93     <para role="recommended" revision="systemd">
     86    <para role="recommended">
    9487      <xref linkend="gcr"/>,
    9588      <xref linkend="gtk3"/>,
    … …  
    9790      <xref linkend="libgdata"/>,
    9891      <xref linkend="libgudev"/>,
    99       <!-- DJ, the below is for logind only. -renodr -->
    100       <xref linkend="systemd"/>, and
     92      <phrase revision="sysv"><xref linkend="elogind"/>,</phrase>
     93      <phrase revision="systemd"><xref linkend="systemd"/>,</phrase> and
    10194      <xref linkend="udisks2"/>
    10295    </para>
    10396
    10497    <bridgehead renderas="sect4">Optional</bridgehead>
    105     <para role="optional" revision="sysv">
    106       <xref linkend="apache"/>,
    107       <xref linkend="avahi"/>,
    108       <xref linkend="bluez"/>,
    109       <xref linkend="dbus-glib"/>,
    110       <xref linkend="fuse2"/>,
    111       <xref linkend="gtk-doc"/>,
    112       <xref linkend="libarchive"/>,
    113       <xref linkend="libgcrypt"/>,
    114       <xref linkend="libxml2"/>,
    115       <xref linkend="libxslt"/>,
    116       <xref linkend="openssh"/>,
    117       <xref linkend="samba"/>,
    118       <ulink url="&gnome-download-http;/gnome-online-accounts">GNOME Online Accounts</ulink>,
    119       <ulink url="http://www.videolan.org/developers/libbluray.html">libbluray</ulink>,
    120       <ulink url="http://www.gphoto.org/">libgphoto2</ulink>,
    121       <ulink url="http://www.libimobiledevice.org/">libimobiledevice</ulink>,
    122       <ulink url="http://sourceforge.net/projects/libmtp/">libmtp</ulink>,
    123       <ulink url="https://github.com/sahlberg/libnfs/">libnfs</ulink>, and
    124       <ulink url="http://twistedmatrix.com/trac/">Twisted</ulink>,
    125     </para>
    126 
    127     <para role="optional" revision="systemd">
     98    <para role="optional">
    12899      <xref linkend="apache"/>,
    129100      <xref linkend="avahi"/>,
    … …  
    173144      -Dsmb=false       \
    174145      -Dtmpfilesdir=no  \
    175       -Dlogind=false    \
    176146      -Ddnssd=false     \
    177147      -Dgoa=false       \

  • gnome/platform/libchamplain.xml

    re77adf7 r51dfb3e  
    99  <!ENTITY libchamplain-download-ftp
    1010           "&gnome-download-ftp;/libchamplain/0.12/libchamplain-&libchamplain-version;.tar.xz">
    11   <!ENTITY libchamplain-md5sum        "a3015b1f32d80d65515f8042ce595b30">
    12   <!ENTITY libchamplain-size          "228 KB">
     11  <!ENTITY libchamplain-md5sum        "52a410767f4797657b505e439bf7ce83">
     12  <!ENTITY libchamplain-size          "612 KB">
    1313  <!ENTITY libchamplain-buildsize     "10 MB">
    1414  <!ENTITY libchamplain-time          "0.1 SBU">
    1515]>
    1616
    17 <sect1 id="libchamplain" xreflabel="libchamplain-&libchamplain-version;" revision="systemd">
     17<sect1 id="libchamplain" xreflabel="libchamplain-&libchamplain-version;">
    1818  <?dbhtml filename="libchamplain.html"?>
    1919
    … …  
    7979      <xref linkend="clutter"/>,
    8080      <xref linkend="clutter-gtk"/>,
    81       <xref linkend="gtk3"/>,
    82       <xref linkend="libsoup"/>, and
    83       <xref linkend="sqlite"/>
     81      <xref linkend="gtk3"/>, and
     82      <xref linkend="libsoup"/>
    8483    </para>
    8584
    … …  
    108107    </para>
    109108
    110 <!-- Because there is still rudimentary autotools support, there is already a
    111      build directory. Change into it and go from there :-) -->
    112 <screen><userinput>cd build &amp;&amp;
    113 
    114 meson --prefix=/usr .. &amp;&amp;
    115 ninja</userinput></screen>
     109<screen><userinput>./configure --prefix=/usr     \
     110            --enable-vala     \
     111            --disable-static  &amp;&amp;
     112make</userinput></screen>
    116113
    117114    <para>
    … …  
    123120    </para>
    124121
    125 <screen role="root"><userinput>ninja install</userinput></screen>
     122<screen role="root"><userinput>make install</userinput></screen>
    126123
    127124  </sect2>
    128   <!--
     125
    129126  <sect2 role="commands">
    130127    <title>Command Explanations</title>
    … …  
    143140
    144141  </sect2>
    145   -->
    146142
    147143  <sect2 role="content">
    … …  
    161157        </seg>
    162158        <seg>
    163           /usr/include/champlain-0.12 and
    164           /usr/share/gtk-doc/html/champlain-0.12
     159          /usr/include/{libchamplain-0.12,libchamplain-gtk-0.12} and
     160          /usr/share/gtk-doc/html/{libchamplain-0.12,libchamplain-gtk-0.12}
    165161        </seg>
    166162      </seglistitem>

  • gnome/platform/libgdata.xml

    re77adf7 r51dfb3e  
    77  <!ENTITY libgdata-download-http "&gnome-download-http;/libgdata/0.17/libgdata-&libgdata-version;.tar.xz">
    88  <!ENTITY libgdata-download-ftp  "&gnome-download-ftp;/libgdata/0.17/libgdata-&libgdata-version;.tar.xz">
    9   <!ENTITY libgdata-md5sum        "d858d411ad394c275643b14993dfeed4">
    10   <!ENTITY libgdata-size          "820 KB">
    11   <!ENTITY libgdata-buildsize     "73 MB (with tests)">
    12   <!ENTITY libgdata-time          "1.1 SBU (with tests)">
     9  <!ENTITY libgdata-md5sum        "cd41fec52a0f0ba999eb60025e0ac806">
     10  <!ENTITY libgdata-size          "1.4 MB">
     11  <!ENTITY libgdata-buildsize     "64 MB (with tests)">
     12  <!ENTITY libgdata-time          "0.7 SBU (with tests)">
    1313]>
    1414
    15 <sect1 id="libgdata" xreflabel="libgdata-&libgdata-version;" revision="systemd">
     15<sect1 id="libgdata" xreflabel="libgdata-&libgdata-version;">
    1616  <?dbhtml filename="libgdata.html"?>
    1717
    … …  
    114114cd    build &amp;&amp;
    115115
    116 meson --prefix=/usr -Dgtk_doc=false .. &amp;&amp;
     116meson --prefix=/usr .. &amp;&amp;
    117117ninja</userinput></screen>
    118118
    119119    <para>
    120       To test the results, issue: <command>ninja test</command>. Note that
     120      To test the results, issue: <command>make check</command>. Note that
    121121      the tests need network access.
    122122    </para>
    … …  
    126126    </para>
    127127
    128 <screen role="root"><userinput>ninja install</userinput></screen>
     128<screen role="root"><userinput>make install</userinput></screen>
    129129
    130130  </sect2>
    … …  
    154154        </seg>
    155155        <seg>
    156           /usr/include/libgdata,
    157           /usr/libexec/installed-tests/libgdata,
    158           /usr/share/gtk-doc/html/gdata, and
    159           /usr/share/installed-tests/libgdata
     156          /usr/include/libgdata and
     157          /usr/share/gtk-doc/html/gdata
    160158        </seg>
    161159      </seglistitem>

  • gnome/platform/libgee.xml

    re77adf7 r51dfb3e  
    1313]>
    1414
    15 <sect1 id="libgee" xreflabel="libgee-&libgee-version;" revision="systemd">
     15<sect1 id="libgee" xreflabel="libgee-&libgee-version;">
    1616  <?dbhtml filename="libgee.html"?>
    1717

  • gnome/platform/libgweather.xml

    re77adf7 r51dfb3e  
    1515]>
    1616
    17 <sect1 id="libgweather" xreflabel="libgweather-&libgweather-version;" revision="systemd">
     17<sect1 id="libgweather" xreflabel="libgweather-&libgweather-version;">
    1818  <?dbhtml filename="libgweather.html"?>
    1919

  • gnome/platform/mutter.xml

    re77adf7 r51dfb3e  
    1313]>
    1414
    15 <sect1 id="mutter" xreflabel="Mutter-&mutter-version;" revision="systemd">
     15<sect1 id="mutter" xreflabel="Mutter-&mutter-version;">
    1616  <?dbhtml filename="mutter.html"?>
    1717

  • gnome/platform/platform.xml

    re77adf7 r51dfb3e  
    1414  <?dbhtml filename="core.html"?>
    1515
    16   <title><phrase revision="sysv">GNOME Libraries and Utilities</phrase>
    17          <phrase revision="systemd">GNOME Libraries and Desktop</phrase></title>
     16  <title>GNOME Libraries and Desktop</title>
    1817
    19   <para revision="sysv">
    20     The objective of this section is not to build a
    21     <application>GNOME</application> desktop, because it depends on
    22     <application>systemd</application>, which BLFS doesn't support. Rather, it
    23     provides packages required for some platform independent
    24     <application>GNOME</application> applications to build and run properly
    25     under any Window Manager (e.g.
    26     <application>Fluxbox</application>,
    27     <application>Icewm</application>,
    28     <application>Openbox</application>,
    29     <application>Sawfish</application>), or Desktop Environment (e.g.
    30     <application>KDE</application>,
    31     <application>XFCE</application>,
    32     <application>LXDE</application>).
    33   </para>
    34 
    35   <para revision="systemd">
     18  <para>
    3619    The objective of this section is to build a
    3720    <application>GNOME</application> desktop, since we have
    … …  
    7154  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gsound.xml"/>
    7255
    73 <!-- systemd: GNOME Desktop -->
    74 <!-- trunk: Required Runtime Dependencies -->
     56<!-- GNOME Desktop -->
    7557  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dummy-desktop.xml"/>
    7658  <!--<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="caribou.xml"/>-->

  • gnome/platform/rest.xml

    re77adf7 r51dfb3e  
    1313]>
    1414
    15 <sect1 id="rest" xreflabel="rest-&rest-version;" revision="systemd">
     15<sect1 id="rest" xreflabel="rest-&rest-version;">
    1616  <?dbhtml filename="rest.html"?>
    1717

  • gnome/platform/zenity.xml

    re77adf7 r51dfb3e  
    1313]>
    1414
    15 <sect1 id="zenity" xreflabel="Zenity-&zenity-version;" revision="systemd">
     15<sect1 id="zenity" xreflabel="Zenity-&zenity-version;">
    1616  <?dbhtml filename="zenity.html"?>
    1717

  • introduction/welcome/changelog.xml

    re77adf7 r51dfb3e  
    4646      <itemizedlist>
    4747        <listitem>
     48          <para>[bdubbs] - Move elogind branch to trunk. Incorporates
     49          Gnome into System V version of the book.</para>
     50        </listitem>
     51        <listitem>
    4852          <para>[xry111] - Update to libarchive-3.4.0. Fixes
    4953          <ulink url="&blfs-ticket-root;12199">#12199</ulink>.</para>
    … …  
    5660          <para>[thomas] - Update bind-9.14.3. Fixes
    5761          <ulink url="&blfs-ticket-root;12176">#12176</ulink></para>
    58         </listitem>
    59         <listitem>
     62        </listitem>
     63        <listitem>
    6064          <para>[thomas] - Update nfs-utils-2.4.1. Fixes
    6165          <ulink url="&blfs-ticket-root;12142">#12142</ulink></para>
    6266        </listitem>
    63         <listitem>
     67        <listitem>
    6468          <para>[thomas] - Update nano-4.3. Fixes
    6569          <ulink url="&blfs-ticket-root;12170">#12170</ulink></para>
    6670        </listitem>
    67         <listitem>
     71        <listitem>
    6872          <para>[thomas] - Update postgresql-11.4. Fixes
    6973          <ulink url="&blfs-ticket-root;12184">#12184</ulink></para>
    … …  
    101105        <listitem>
    102106          <para>[renodr] - Update to PyYAML-5.1.1 (Python Module). Fixes
    103           <ulink url="&blfs-ticket-root;12141">#12141</ulink>.</para>
     107          <ulink url="&blfs-ticket-root;12142">#12142</ulink>.</para>
    104108        </listitem>
    105109        <listitem>
    … …  
    221225    </listitem>
    222226
    223     <listitem>
     227
     228    <listitem revision="sysv">
    224229      <para>June 15th, 2019</para>
    225230      <itemizedlist>
    … …  
    341346        </listitem>
    342347        <listitem>
     348          <para>[dj] - Add lxpolkit and remove LXDE dependencies on
     349          consolekit.</para>
     350        </listitem>
     351        <listitem>
    343352          <para>[xry111] - Update to network-manager-applet-1.8.22. Fixes
    344353          <ulink url="&blfs-ticket-root;12109">#12109</ulink>.</para>
     354        </listitem>
     355        <listitem revision="sysv">
     356          <para>[dj] - Install the gdm bootscript and change initdefault to
     357          runlevel 5 for gdm.</para>
     358        </listitem>
     359        <listitem revision="sysv">
     360          <para>[dj] - Bring back all Gnome Desktop packages.</para>
     361        </listitem>
     362        <listitem revision="sysv">
     363          <para>[dj] - Remove NetworkManager required dependency on ConsoleKit
     364          in favor of elogind.</para>
     365        </listitem>
     366   <listitem revision="sysv">
     367          <para>[dj] - Add elogind-241.3 and adjust several packages to
     368          utilize it.</para>
    345369        </listitem>
    346370      </itemizedlist>
    … …  
    12921316        <listitem>
    12931317          <para>[pierre] - Archive w3m and allow Linux-pam documentation to
    1294                be generated with lynx.</para>
     1318          be generated with lynx.</para>
    12951319        </listitem>
    12961320      </itemizedlist>
    … …  
    21732197        <listitem>
    21742198          <para>[bdubbs] - Update xorg-libs: libXext-1.3.4,
    2175           libXft-2.3.3, libxkbfile-1.1.0,       libXmu-1.1.3, libXrandr-1.5.2,
     2199          libXft-2.3.3, libxkbfile-1.1.0, libXmu-1.1.3, libXrandr-1.5.2,
    21762200          xtrans-1.4.0, libXvMC-1.0.11, and libXxf86dga-1.1.5. Fixes
    21772201          <ulink url="&blfs-ticket-root;11814">#11814</ulink>,
    … …  
    26502674      </itemizedlist>
    26512675    </listitem>
    2652     <listitem>
    2653 
     2676
     2677    <listitem>
    26542678      <para>March 1st, 2019</para>
    26552679      <itemizedlist>

  • kde/plasma5/plasma-all.xml

    re77adf7 r51dfb3e  
    307307
    308308<screen role="root"><userinput>cat &gt; /etc/pam.d/kde &lt;&lt; "EOF"
    309 # Begin /etc/pam.d/kde
     309<literal># Begin /etc/pam.d/kde
    310310
    311311auth     requisite      pam_nologin.so
    … …  
    319319session  include        system-session
    320320
    321 # End /etc/pam.d/kde
     321# End /etc/pam.d/kde</literal>
    322322EOF
    323323
    324324cat &gt; /etc/pam.d/kde-np &lt;&lt; "EOF"
    325 # Begin /etc/pam.d/kde-np
     325<literal># Begin /etc/pam.d/kde-np
    326326
    327327auth     requisite      pam_nologin.so
    … …  
    335335session  include        system-session
    336336
    337 # End /etc/pam.d/kde-np
     337# End /etc/pam.d/kde-np</literal>
    338338EOF
    339339
    340340cat &gt; /etc/pam.d/kscreensaver &lt;&lt; "EOF"
    341 # Begin /etc/pam.d/kscreensaver
     341<literal># Begin /etc/pam.d/kscreensaver
    342342
    343343auth    include system-auth
    344344account include system-account
    345345
    346 # End /etc/pam.d/kscreensaver
     346# End /etc/pam.d/kscreensaver</literal>
    347347EOF</userinput></screen>
    348348    </sect3>
    … …  
    369369    </para>
    370370
    371 <screen revision="sysv"><userinput>cat &gt; ~/.xinitrc &lt;&lt; "EOF"
    372 <literal>ck-launch-session dbus-launch --exit-with-session $KF5_PREFIX/bin/startkde</literal>
    373 EOF
    374 
    375 startx</userinput></screen>
    376 
    377 <screen revision="systemd"><userinput>cat &gt; ~/.xinitrc &lt;&lt; "EOF"
     371<screen><userinput>cat &gt; ~/.xinitrc &lt;&lt; "EOF"
    378372<literal>dbus-launch --exit-with-session $KF5_PREFIX/bin/startkde</literal>
    379373EOF
    … …  
    397391    <screen><userinput>startx &amp;&gt; ~/x-session-errors</userinput></screen>
    398392
    399     <note revision="sysv">
    400       <para>
    401         You may wish to drop consolekit and/or dbus-launch, e.g., just using
    402         startkde in ~/.xinitrc. However some capabilities such as mounting or
    403         umounting file systems from a file manager will not be possible, or the
    404         reboot option may be absent or inoperative, among other problems.
    405       </para>
    406     </note>
    407393    <para>
    408394      When shutting down or rebooting, the shutdown messages appear on the vt

  • lxde/desktop/lxde-common.xml

    re77adf7 r51dfb3e  
    9191    <bridgehead renderas="sect4">Recommended Runtime Dependencies</bridgehead>
    9292    <para role="recommended">
    93       <phrase revision="sysv">
    94          <xref role="runtime" linkend="consolekit"/> and
    95       </phrase>
    96       <xref role="runtime" linkend="dbus"/>
     93      <xref linkend="lxsession"/> (for <application>lxpolkit</application>) or
     94      <xref linkend="polkit-gnome"/>
    9795    </para>
    9896
    … …  
    159157
    160158<screen><userinput>cat &gt; ~/.xinitrc &lt;&lt; "EOF"
    161 <literal revision="sysv"># No need to run dbus-launch, since it is run by startlxde
    162 ck-launch-session startlxde</literal><literal revision="systemd"># No need to run dbus-launch, since it is run by startlxde
     159<literal># No need to run dbus-launch, since it is run by startlxde
    163160startlxde</literal>
    164161EOF
    … …  
    181178
    182179    <screen><userinput>startx &amp;&gt; ~/.x-session-errors</userinput></screen>
    183 
    184     <note revision="sysv">
    185       <para>
    186         You may wish to drop consolekit, just using
    187         startlxde in ~/.xinitrc. However some capabilities such as mounting or
    188         umounting file systems from a file manager will not be available, or
    189         the reboot option will be absent or inoperative, among other problems.
    190       </para>
    191     </note>
    192180
    193181    <para>

  • lxde/desktop/lxsession.xml

    re77adf7 r51dfb3e  
    8585      <xref role="runtime" linkend="lsb-release"/> (may be used at runtime
    8686      to display the distribution release in the logout dialog),
    87       <phrase revision="sysv">
    88         <xref role="runtime" linkend="consolekit"/> (used at runtime by
    89         <command>lxsession-logout</command>),
    90       </phrase>
    9187      <xref linkend="gtk3"/>, and
    9288      <xref linkend="libxslt"/> with

  • multimedia/libdriv/pulseaudio.xml

    re77adf7 r51dfb3e  
    7676    </itemizedlist>
    7777
    78 <!--<bridgehead renderas="sect3">Additional Downloads</bridgehead>
    79     <itemizedlist spacing="compact">
    80       <listitem>
    81         <para>
    82           Required patch if using glibc-2.27:
    83           <ulink url="&patch-root;/pulseaudio-&pulseaudio-version;-glibc_2.27_fix-1.patch"/>
    84         </para>
    85       </listitem>
    86     </itemizedlist>-->
    87 
    8878    <bridgehead renderas="sect3">PulseAudio Dependencies</bridgehead>
    8979
    … …  
    9787      <xref linkend="alsa-lib"/>,
    9888      <xref linkend="dbus"/>,
     89      <phrase revision="sysv"><xref linkend="elogind"/>,</phrase>
    9990      <xref linkend="glib2"/>,
    10091      <xref linkend="libcap-pam"/>,
    … …  
    10798      <xref linkend="avahi"/>,
    10899      <xref linkend="bluez"/>,
    109       <phrase revision="sysv">
    110         <xref role="runtime" linkend="consolekit"/> (runtime),</phrase>
    111100      <xref linkend="fftw"/>,
    112101      <xref linkend="GConf"/>,
    … …  
    153142sed -i "s:use-case.h:alsa/use-case.h:" src/modules/alsa/alsa-ucm.h</userinput></screen>
    154143
    155 <screen><userinput>NOCONFIGURE=1 ./bootstrap.sh     &amp;&amp;
     144<screen revision="sysv"><userinput>NOCONFIGURE=1 ./bootstrap.sh     &amp;&amp;
     145./configure --prefix=/usr                \
     146            --sysconfdir=/etc            \
     147            --localstatedir=/var         \
     148            --disable-bluez4             \
     149            --disable-bluez5             \
     150            --disable-rpath              \
     151            --with-systemduserunitdir=no &amp;&amp;
     152make</userinput></screen>
     153
     154<screen revision="systemd"><userinput>NOCONFIGURE=1 ./bootstrap.sh     &amp;&amp;
    156155./configure --prefix=/usr        \
    157156            --sysconfdir=/etc    \

  • multimedia/libdriv/sound-theme-freedesktop.xml

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

  • networking/netlibs/uhttpmock.xml

    re77adf7 r51dfb3e  
    1313]>
    1414
    15 <sect1 id="uhttpmock" xreflabel="uhttpmock-&uhttpmock-version;" revision="systemd">
     15<sect1 id="uhttpmock" xreflabel="uhttpmock-&uhttpmock-version;">
    1616  <?dbhtml filename="uhttpmock.html"?>
    1717

  • networking/netutils/networkmanager.xml

    re77adf7 r51dfb3e  
    9595    <bridgehead renderas="sect4">Recommended</bridgehead>
    9696    <para role="recommended">
    97       <phrase revision="sysv"><xref linkend="consolekit"/>,</phrase>
    9897      <xref linkend="curl"/>,
    9998      <xref linkend="dhcpcd"/> or
    … …  
    106105      <xref linkend="polkit"/>,
    107106      <xref linkend="pygobject3"/>,
     107      <phrase revision="sysv"><xref linkend="elogind"/>,</phrase>
    108108      <phrase revision="systemd"><xref linkend="systemd"/>,</phrase>
    109109      <xref linkend="upower"/>,
    … …  
    179179      -Dselinux=false            \
    180180      -Dudev_dir=/lib/udev       \
    181       -Dsession_tracking=no      \
     181      -Dsession_tracking=elogind \
    182182      -Dmodem_manager=false      \
    183183      -Dsystemdsystemunitdir=no  \
    … …  
    244244
    245245    <para revision="sysv">
    246       <parameter>-Dsession_tracking=no</parameter>,
    247       <parameter>-Dsystemdsystemunitdir=no</parameter>, and
     246      <parameter>-Dsystemdsystemunitdir=no</parameter> and
    248247      <parameter>-Dsystemd_journal=false</parameter>: systemd is not
    249248      used for sysv init systems.
    … …  
    267266      <application>ModemManager</application> is not installed. Omit if you
    268267      have built <application>ModemManager</application>.
     268    </para>
     269
     270    <para revision="sysv">
     271      <parameter>-Dsession_tracking=elogind</parameter>: This switch
     272      is used to set <command>elogind</command> as the default
     273      program for session tracking.
    269274    </para>
    270275

  • packages.ent

    re77adf7 r51dfb3e  
    273273<!ENTITY cups-pk-helper-version       "0.2.6">
    274274<!ENTITY dbus-version                 "1.12.16">   <!-- Even minors only -->
     275<!ENTITY elogind-version              "241.3">
    275276<!ENTITY eudev-version                "1.7">
    276277<!ENTITY fcron-version                "3.2.1">

  • postlfs/filesystems/fuse3.xml

    re77adf7 r51dfb3e  
    182182
    183183<screen role="root"><userinput>cat &gt; /etc/fuse.conf &lt;&lt; "EOF"
    184 # Set the maximum number of FUSE mounts allowed to non-root users.
     184<literal># Set the maximum number of FUSE mounts allowed to non-root users.
    185185# The default is 1000.
    186186#
    … …  
    190190# mount options.
    191191#
    192 #user_allow_other
     192#user_allow_other</literal>
    193193EOF</userinput></screen>
    194194

  • postlfs/filesystems/initramfs.xml

    re77adf7 r51dfb3e  
    5555
    5656    <screen role="root"><userinput>cat &gt; /sbin/mkinitramfs &lt;&lt; "EOF"
    57 #!/bin/bash
     57<literal>#!/bin/bash
    5858# This file based in part on the mkinitramfs script for the LFS LiveCD
    5959# written by Alexander E. Patrakov and Jeremy Huntwork.
    … …  
    244244rm -rf $WDIR $unsorted
    245245printf "done.\n"
    246 
     246</literal>
    247247EOF
    248248
    … …  
    251251    <screen role="root"><userinput>mkdir -p /usr/share/mkinitramfs &amp;&amp;
    252252cat &gt; /usr/share/mkinitramfs/init.in &lt;&lt; "EOF"
    253 #!/bin/sh
     253<literal>#!/bin/sh
    254254
    255255PATH=/bin:/usr/bin:/sbin:/usr/sbin
    … …  
    358358
    359359exec switch_root /.root "$init" "$@"
    360 
     360</literal>
    361361EOF</userinput></screen>
    362362

  • postlfs/security/consolekit.xml

    re77adf7 r51dfb3e  
    219219
    220220<screen role="root"><userinput>cat &gt; /usr/lib/ConsoleKit/run-session.d/pam-foreground-compat.ck &lt;&lt; "EOF"
    221 #!/bin/sh
     221<literal>#!/bin/sh
    222222TAGDIR=/var/run/console
    223223
    … …  
    235235    sed -i "\%^$CK_SESSION_ID\$%d" "$TAGFILE"
    236236    [ -s "$TAGFILE" ] || rm -f "$TAGFILE"
    237 fi
     237fi</literal>
    238238EOF
    239239chmod -v 755 /usr/lib/ConsoleKit/run-session.d/pam-foreground-compat.ck</userinput></screen>

  • postlfs/security/libcap.xml

    re77adf7 r51dfb3e  
    9898<screen role="root"><userinput>mv -v /etc/pam.d/system-auth{,.bak} &amp;&amp;
    9999cat &gt; /etc/pam.d/system-auth &lt;&lt; "EOF" &amp;&amp;
    100 # Begin /etc/pam.d/system-auth
     100<literal># Begin /etc/pam.d/system-auth
    101101
    102 auth      optional    pam_cap.so
     102auth      optional    pam_cap.so</literal>
    103103EOF
    104104tail -n +3 /etc/pam.d/system-auth.bak &gt;&gt; /etc/pam.d/system-auth</userinput></screen>

  • postlfs/security/linux-pam.xml

    re77adf7 r51dfb3e  
    190190
    191191cat &gt; /etc/pam.d/other &lt;&lt; "EOF"
    192 auth     required       pam_deny.so
     192<literal>auth     required       pam_deny.so
    193193account  required       pam_deny.so
    194194password required       pam_deny.so
    195 session  required       pam_deny.so
     195session  required       pam_deny.so</literal>
    196196EOF</userinput></screen>
    197197

  • postlfs/security/polkit.xml

    re77adf7 r51dfb3e  
    7272      </listitem>
    7373    </itemizedlist>
    74 <!--
    75     <bridgehead renderas="sect3">Additional Downloads</bridgehead>
    76     <itemizedlist spacing="compact">
    77       <listitem>
    78         <para>
    79           Required patch:
    80           <ulink url="&patch-root;/polkit-&polkit-version;-security_patch-3.patch"/>
     74
     75    <bridgehead renderas="sect3" revision="sysv">Additional Downloads</bridgehead>
     76    <itemizedlist spacing="compact" revision="sysv">
     77      <listitem>
     78        <para>
     79          Recommended patch:
     80          <ulink url="&patch-root;/polkit-&polkit-version;-fix_elogind_detection-1.patch"/>
    8181        </para>
    8282      </listitem>
    8383    </itemizedlist>
    84 -->
     84
    8585    <bridgehead renderas="sect3">Polkit Dependencies</bridgehead>
    8686
    … …  
    9191    </para>
    9292
    93     <bridgehead renderas="sect4" revision="systemd">Recommended</bridgehead>
    94     <para role="recommended" revision="systemd">
    95       <xref linkend="linux-pam"/>
    96     </para>
    97 
    98     <note revision="systemd">
     93    <bridgehead renderas="sect4">Recommended</bridgehead>
     94    <para role="recommended">
     95      <xref linkend="linux-pam"/><phrase revision="sysv"> and
     96      <xref linkend="elogind"/></phrase>
     97    </para>
     98
     99    <note>
    99100      <para>
    100         Since <command>systemd-logind</command> uses PAM to register user
    101         sessions, it is a good idea to build <application>Polkit</application>
    102         with PAM support so <command>systemd-logind</command> can track
    103         <application>Polkit</application> sessions.
     101        Since <phrase revision="sysv"><command>elogind</command></phrase>
     102        <phrase revision="systemd"><command>systemd-logind</command></phrase>
     103        uses PAM to register user sessions, it is a good idea to build
     104        <application>Polkit</application> with PAM support so
     105        <phrase revision="sysv"><command>elogind</command></phrase>
     106        <phrase revision="systemd"><command>systemd-logind</command></phrase>
     107        can track <application>Polkit</application> sessions.
    104108      </para>
    105109    </note>
    … …  
    115119      <xref linkend="DocBook"/>,
    116120      <xref linkend="docbook-xsl"/>,
    117       <xref linkend="gtk-doc"/>, <phrase revision="systemd">and </phrase>
    118       <xref linkend="libxslt"/><phrase revision="sysv">, and
    119       <xref linkend="linux-pam"/></phrase>
     121      <xref linkend="gtk-doc"/>, and
     122      <xref linkend="libxslt"/>
    120123    </para>
    121124
    … …  
    169172<screen><userinput>sed -i "s:/sys/fs/cgroup/systemd/:/sys:g" configure</userinput></screen>
    170173    </note>
    171 <!--
    172     <para>Fix an issue identified upstream after the package release:</para>
    173 
    174 <screen><userinput>sed -e '/JS_ReportWarningUTF8/s/,/, "%s",/'  \
    175         -i  src/polkitbackend/polkitbackendjsauthority.cpp</userinput></screen> -->
    176 
     174
     175    <para revision="sysv">
     176      Fix an issue introduced in recent <application>Polkit</application>
     177      realeases with elogind:
     178    </para>
     179
     180<screen revision="sysv"><userinput>patch -Np1 -i ../polkit-&polkit-version;-fix_elogind_detection-1.patch &amp;&amp;
     181autoreconf -fi</userinput></screen>
    177182    <para>
    178183      Install <application>Polkit</application> by running the following
    179184      commands:
    180185    </para>
    181 
    182 <screen revision="sysv"><userinput>./configure --prefix=/usr                    \
    183             --sysconfdir=/etc                \
    184             --localstatedir=/var             \
    185             --disable-static                 \
    186             --enable-libsystemd-login=no     \
    187             --enable-libelogind=no           \
    188             --with-authfw=shadow             \
    189             --with-os-type=LFS               &amp;&amp;
    190 make</userinput></screen>
    191186
    192187<screen revision="systemd"><userinput>./configure --prefix=/usr        \
    … …  
    197192make</userinput></screen>
    198193
     194<screen revision="sysv"><userinput>./configure --prefix=/usr        \
     195            --sysconfdir=/etc    \
     196            --localstatedir=/var \
     197            --disable-static     \
     198            --with-os-type=LFS   \
     199            --enable-libsystemd-login=no &amp;&amp;
     200make</userinput></screen>
     201
    199202    <para>
    200203      To test the results, issue: <command>make check</command>.
    … …  
    214217    <title>Command Explanations</title>
    215218
    216     <para revision="sysv">
    217       <parameter>--enable-libsystemd-login=no</parameter>: This parameter fixes
    218       building without <application>systemd</application>, which is not part
    219       of LFS/BLFS. If you use <application>systemd</application>,
    220       replace "no" by "yes".
    221     </para>
    222 
    223     <para revision="sysv">
    224       <parameter>--with-authfw=shadow</parameter>: This parameter configures the
    225       package to use the <application>Shadow</application> rather than the
    226       <application>Linux-PAM</application> Authentication framework. Change
    227       the argument to 'pam' if you would like to use
    228       <application>Linux-PAM</application>.
    229     </para>
    230 
    231     <para revision="systemd">
     219    <para>
    232220      <option>--with-authfw=shadow</option>: This switch enables the
    233221      package to use the <application>Shadow</application> rather than the
    … …  
    240228
    241229    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    242       href="../../xincludes/gtk-doc-rebuild.xml"/>
     230    href="../../xincludes/gtk-doc-rebuild.xml"/>
     231
     232    <para revision="sysv">
     233      <parameter>--enable-libsystemd-login=no</parameter>: This switch forces
     234      polkit to build with elogind support (if available) rather than systemd.
     235    </para>
    243236
    244237  </sect2>

  • postlfs/virtualization/qemu.xml

    re77adf7 r51dfb3e  
    525525<screen role="root"
    526526        revision="systemd"><userinput>cat &gt;&gt; /etc/sysctl.d/60-net-forward.conf &lt;&lt; EOF
    527 net.ipv4.ip_forward=1
     527<literal>net.ipv4.ip_forward=1</literal>
    528528EOF</userinput></screen>
    529529

  • pst/scanning/sane.xml

    re77adf7 r51dfb3e  
    296296
    297297<screen role="root"><userinput>cat &gt;&gt; /etc/sane.d/net.conf &lt;&lt; "EOF"
    298 connect_timeout = 60
    299 &lt;server_ip&gt;
     298<literal>connect_timeout = 60
     299&lt;server_ip&gt;</literal>
    300300EOF</userinput></screen>
    301301
    … …  
    320320
    321321cat &gt; /usr/share/applications/xscanimage.desktop &lt;&lt; "EOF" &amp;&amp;
    322 [Desktop Entry]
     322<literal>[Desktop Entry]
    323323Encoding=UTF-8
    324324Name=XScanImage - Scanning
    … …  
    328328Terminal=false
    329329Type=Application
    330 Categories=Application;Graphics
     330Categories=Application;Graphics</literal>
    331331EOF
    332332

  • x/dm/lxdm.xml

    re77adf7 r51dfb3e  
    8686    <bridgehead renderas="sect4">Recommended</bridgehead>
    8787    <para role="recommended">
    88      <phrase revision="sysv"><xref linkend="consolekit"/> and</phrase>
    89      <xref linkend="linux-pam"/>
     88     <xref linkend="lxsession"/> (for <application>lxpolkit</application>) or
     89     <xref linkend="polkit-gnome"/>
    9090    </para>
    9191
    … …  
    112112auth     requisite      pam_nologin.so
    113113auth     required       pam_env.so
     114auth     required       pam_succeed_if.so uid >= 1000 quiet
    114115auth     include        system-auth
    115116
    … …  
    302303<screen role="root"><userinput>cp -v /etc/inittab{,-orig} &amp;&amp;
    303304sed -i '/initdefault/ s/3/5/' /etc/inittab</userinput></screen>
     305
     306      <para>
     307          You should also disable default elogind power management:
     308      </para>
     309 
     310<screen role="root"><userinput>cat &gt;&gt; /etc/elogind/logind.conf &lt;&lt; "EOF"
     311<literal>AllowSuspend=no
     312AllowHibernation=no</literal>
     313EOF</userinput></screen>
    304314
    305315      <note>

  • x/installing/libinput.xml

    re77adf7 r51dfb3e  
    8888      <xref linkend="gtk3"/> (to build the GUI event viewer),
    8989      <ulink url="http://www.nongnu.org/libunwind/">libunwind</ulink> (required for tests),
    90       <ulink revision="sysv" url="https://sourceforge.net/projects/linuxwacom/files/libwacom/">libwacom</ulink>
    91       <xref revision="systemd" linkend="libwacom"/>
    92       <!-- commas outside the rev get rendered on either version -->
    93       , and
     90      <xref linkend="libwacom"/>, and
    9491      <ulink url="https://pypi.org/project/pyparsing/">PyParsing</ulink> (for one non-root test)
    9592    </para>

  • x/installing/x7lib.xml

    re77adf7 r51dfb3e  
    155155      <xref linkend="fontconfig"/> and
    156156      <xref linkend="libxcb"/>
     157    </para>
     158
     159    <bridgehead renderas="sect4" revision="sysv">Recommended</bridgehead>
     160    <para role="recommended" revision="sysv">
     161      <xref linkend="elogind"/>
    157162    </para>
    158163

  • x/installing/xorg-config.xml

    re77adf7 r51dfb3e  
    268268
    269269<screen role="root"><userinput>cat &gt; /etc/X11/xorg.conf.d/xkb-defaults.conf &lt;&lt; "EOF"
    270 Section "InputClass"
     270<literal>Section "InputClass"
    271271    Identifier "XKB Defaults"
    272272    MatchIsKeyboard "yes"
    273273    Option "XkbLayout" "fr"
    274274    Option "XkbOptions" "terminate:ctrl_alt_bksp"
    275 EndSection
     275EndSection</literal>
    276276EOF</userinput></screen>
    277277
    … …  
    294294
    295295<screen role="root"><userinput>cat &gt; /etc/X11/xorg.conf.d/videocard-0.conf &lt;&lt; "EOF"
    296 Section "Device"
     296<literal>Section "Device"
    297297    Identifier  "Videocard0"
    298298    Driver      "radeon"
    … …  
    300300    BoardName   "ATI Radeon 7500"
    301301    Option      "NoAccel" "true"
    302 EndSection
     302EndSection</literal>
    303303EOF</userinput></screen>
    304304
    … …  
    310310
    311311<screen role="root"><userinput>cat &gt; /etc/X11/xorg.conf.d/server-layout.conf &lt;&lt; "EOF"
    312 Section "ServerLayout"
     312<literal>Section "ServerLayout"
    313313    Identifier     "DefaultLayout"
    314314    Screen      0  "Screen0" 0 0
    315315    Screen      1  "Screen1" LeftOf "Screen0"
    316316    Option         "Xinerama"
    317 EndSection
     317EndSection</literal>
    318318EOF</userinput></screen>
    319319

  • x/installing/xorg-server.xml

    re77adf7 r51dfb3e  
    7070      </listitem>
    7171    </itemizedlist>
     72
    7273<!-- Prime support is now automatically added in DRI3, and this patch
    7374     may break things on some setups.
    … …  
    9293
    9394    <bridgehead renderas="sect4">Recommended</bridgehead>
    94     <para role="recommended" revision="sysv">
    95       <xref linkend="libepoxy"/> (required for glamor, see command
    96       explanations below)
    97     </para>
    98     <para role="recommended" revision="systemd">
     95    <para role="recommended">
    9996      <xref linkend="libepoxy"/> (needed for glamor and Xwayland),
    10097      <xref linkend="wayland"/> (needed for Xwayland),
    10198      <xref linkend="wayland-protocols"/>, and
    102       <xref linkend="systemd"/>
     99      <phrase revision="sysv"><xref linkend="elogind"/></phrase>
     100      <phrase revision="systemd"><xref linkend="systemd"/></phrase>
    103101    </para>
    104102
    … …  
    115113      <xref linkend="xcb-util-wm"/> (all three to build Xephyr),
    116114      <xref linkend="xmlto"/> (to build documentation),
    117       <phrase revision="sysv"><xref linkend="wayland"/> (needed for Xwayland),
    118       <xref linkend="wayland-protocols"/>,</phrase>
    119115      <ulink url="http://download.savannah.gnu.org/releases/libunwind">libunwind</ulink>, and
    120116      <ulink url="https://www.x.org/archive/individual/doc/">xorg-sgml-doctools</ulink> (to build documentation)
    … …  
    140136    </para>
    141137
    142 <screen revision="sysv"><userinput>./configure $XORG_CONFIG            \
    143            --enable-glamor          \
    144            --enable-install-setuid  \
    145            --enable-suid-wrapper    \
    146            --disable-systemd-logind \
    147            --with-xkb-output=/var/lib/xkb &amp;&amp;
    148 make</userinput></screen>
    149 
    150 <screen revision="systemd"><userinput>./configure $XORG_CONFIG          \
    151             --enable-glamor       \
    152             --enable-suid-wrapper \
     138<screen><userinput>./configure $XORG_CONFIG            \
     139            --enable-glamor         \
     140            --enable-suid-wrapper   \
     141            --enable-install-setuid \
    153142            --with-xkb-output=/var/lib/xkb &amp;&amp;
    154143make</userinput></screen>
    … …  
    188177    </para>
    189178
    190     <para revision="sysv">
    191       <parameter>--enable-install-setuid</parameter>: The Xorg binary must run
    192       as the root user. This switch ensures that the binary is installed
    193       setuid when <command>make</command> is run by an unprivileged user.
    194     </para>
    195 
    196179    <para>
    197180      <parameter>--enable-suid-wrapper</parameter>: Build suid-root wrapper for
    … …  
    199182    </para>
    200183
    201     <para revision="sysv">
    202       <parameter>--disable-systemd-logind</parameter>: Do not build
    203       systemd-logind support, otherwise, an error (EE), logged in
    204       <filename>/var/log/Xorg.0.log</filename>, occurs when starting the X
    205       server.  Systemd is not supported by this (sysv) version of BLFS.
    206     </para>
    207 
    208     <para revision="systemd">
     184    <para>
    209185      <option>--disable-systemd-logind --enable-install-setuid</option>:
    210       These switches disable systemd-logind integration and restore the setuid
    211       bit to the Xorg executable, allowing Xorg Server to work
    212       without having the systemd PAM module installed and set up.
     186      These switches disable <phrase revision="systemd">systemd-logind</phrase>
     187      <phrase revision="sysv">elogind</phrase> integration and restore the
     188      setuid bit to the Xorg executable, allowing Xorg Server to work
     189      without having the <phrase revision="systemd">systemd</phrase>
     190      <phrase revision="elogind">elogind</phrase> PAM module configured.
    213191    </para>
    214192

  • x/installing/xorg7.xml

    re77adf7 r51dfb3e  
    125125
    126126<screen role="root"><userinput>cat &gt; /etc/profile.d/xorg.sh &lt;&lt; EOF
    127 XORG_PREFIX="$XORG_PREFIX"
     127<literal>XORG_PREFIX="$XORG_PREFIX"
    128128XORG_CONFIG="--prefix=\$XORG_PREFIX --sysconfdir=/etc --localstatedir=/var --disable-static"
    129 export XORG_PREFIX XORG_CONFIG
     129export XORG_PREFIX XORG_CONFIG</literal>
    130130EOF
    131131chmod 644 /etc/profile.d/xorg.sh</userinput></screen>
    … …  
    154154
    155155<screen role="root"><userinput>cat &gt;&gt; /etc/profile.d/xorg.sh &lt;&lt; "EOF"
    156 
     156<literal>
    157157pathappend $XORG_PREFIX/bin             PATH
    158158pathappend $XORG_PREFIX/lib/pkgconfig   PKG_CONFIG_PATH
    … …  
    165165ACLOCAL="aclocal -I $XORG_PREFIX/share/aclocal"
    166166
    167 export PATH PKG_CONFIG_PATH ACLOCAL LIBRARY_PATH C_INCLUDE_PATH CPLUS_INCLUDE_PATH
     167export PATH PKG_CONFIG_PATH ACLOCAL LIBRARY_PATH C_INCLUDE_PATH CPLUS_INCLUDE_PATH</literal>
    168168EOF</userinput></screen>
    169169

  • x/lib/clutter.xml

    re77adf7 r51dfb3e  
    9292
    9393    <bridgehead renderas="sect4">Recommended</bridgehead>
    94     <para role="recommended" revision="sysv">
    95       <xref linkend="gobject-introspection"/> and
    96       <xref linkend="gtk3"/>
    97     </para>
    98     <para role="recommended" revision="systemd">
     94    <para role="recommended">
    9995      <xref linkend="gobject-introspection"/>,
    10096      <xref linkend="gtk3"/>,
    … …  
    106102
    107103    <bridgehead renderas="sect4">Optional</bridgehead>
    108     <para role="optional" revision="sysv">
    109       <xref linkend="gtk-doc"/>,
    110       <xref linkend="libgudev"/>,
    111       <xref linkend="libinput"/>,
    112       <xref linkend="libxkbcommon"/>,
    113       <ulink url="https://github.com/kergoth/tslib">Tslib</ulink>, and
    114       <xref linkend="wayland"/>
    115     </para>
    116     <para role="optional" revision="systemd">
     104    <para role="optional">
    117105      <xref linkend="gtk-doc"/> and
    118106      <ulink url="https://github.com/kergoth/tslib">Tslib</ulink>
    … …  
    141129    </para>
    142130
    143 <screen revision="sysv"><userinput>./configure --prefix=/usr --sysconfdir=/etc --enable-egl-backend &amp;&amp;
    144 make</userinput></screen>
    145 
    146 <screen revision="systemd"><userinput>./configure --prefix=/usr               \
     131<screen><userinput>./configure --prefix=/usr               \
    147132            --sysconfdir=/etc           \
    148133            --enable-egl-backend        \
    … …  
    175160
    176161    <para>
    177       <parameter revision="systemd">--enable-evdev-input</parameter><option
    178       revision="sysv">--enable-evdev-input</option>: This switch enables
     162      <parameter>--enable-evdev-input</parameter>: This switch enables
    179163      the experimental Evdev input backend which is required for
    180164      <application>GNOME</application> Wayland support.
    … …  
    182166
    183167    <para>
    184       <parameter revision="systemd">--enable-wayland</parameter><option
    185       revision="sysv">--enable-wayland</option> and <parameter
    186       revision="systemd">--enable-wayland-compositor</parameter><option
    187       revision="sysv">--enable-wayland-compositor</option>: These switches
    188       enable the experimental <application>Wayland</application> API in
    189       <application>Clutter</application> which is required for
     168      <parameter>--enable-wayland</parameter> and
     169      <parameter>--enable-wayland-compositor</parameter>: These
     170      switches enable the experimental <application>Wayland</application> API
     171      in <application>Clutter</application> which is required for
    190172      <application>GNOME</application> Wayland support.
    191173    </para>

  • x/lib/cogl.xml

    re77adf7 r51dfb3e  
    8383      <xref linkend="gdk-pixbuf"/>,
    8484      <xref linkend="glu"/>,
    85       <xref linkend="mesa"/>,<phrase revision="sysv"> and</phrase>
    86       <xref linkend="pango"/><phrase revision="systemd">, and
    87       <xref linkend="wayland"/></phrase>
     85      <xref linkend="mesa"/>,
     86      <xref linkend="pango"/>, and
     87      <xref linkend="wayland"/>
    8888    </para>
    8989
    … …  
    9797      <xref linkend="gst10-plugins-base"/>,
    9898      <xref linkend="gtk-doc"/>,
    99       <xref linkend="sdl"/>,<phrase revision="systemd"> and</phrase>
    100       <xref linkend="sdl2"/><phrase revision="sysv">, and
    101       <xref linkend="wayland"/></phrase>
     99      <xref linkend="sdl"/>, and
     100      <xref linkend="sdl2"/>
    102101    </para>
    103102
    … …  
    125124    &parallel_issues;
    126125
    127 <screen revision="sysv"><userinput>sed -i 's/^#if COGL/#ifdef COGL/' cogl/winsys/cogl-winsys-egl.c &amp;&amp;
    128 
    129 ./configure --prefix=/usr --enable-gles1 --enable-gles2         &amp;&amp;
    130 make</userinput></screen>
    131 
    132 <screen revision="systemd"><userinput>sed -i 's/^#if COGL/#ifdef COGL/' cogl/winsys/cogl-winsys-egl.c &amp;&amp;
     126<screen><userinput>sed -i 's/^#if COGL/#ifdef COGL/' cogl/winsys/cogl-winsys-egl.c &amp;&amp;
    133127
    134128./configure --prefix=/usr --enable-gles1 --enable-gles2         \
    … …  
    166160
    167161    <para>
    168       <phrase revision="sysv">
    169       <option>--enable-{kms,wayland,xlib}-egl-platform</option>:</phrase>
    170       <phrase revision="systemd">
    171       <parameter>--enable-{kms,wayland,xlib}-egl-platform</parameter>:</phrase>
     162      <parameter>--enable-{kms,wayland,xlib}-egl-platform</parameter>:
    172163      These switches enable support for KMS, Wayland and Xlib EGL platforms.
    173164      They are required for <application>GNOME</application> Wayland support.
    … …  
    175166
    176167    <para>
    177       <phrase revision="sysv">
    178       <option>--enable-wayland-egl-server</option>:</phrase>
    179       <phrase revision="systemd">     
    180       <parameter>--enable-wayland-egl-server</parameter>:</phrase> This switch
     168      <parameter>--enable-wayland-egl-server</parameter>: This switch
    181169      enables <application>Cogl</application>'s Wayland Server API which is
    182170      required for <application>GNOME</application> Wayland support.

  • x/lib/gtk+2.xml

    re77adf7 r51dfb3e  
    212212
    213213<screen><userinput>cat &gt; ~/.gtkrc-2.0 &lt;&lt; "EOF"
    214 include "/usr/share/themes/<replaceable>Glider</replaceable>/gtk-2.0/gtkrc"
    215 gtk-icon-theme-name = "<replaceable>hicolor</replaceable>"
     214<literal>include "/usr/share/themes/<replaceable>Glider</replaceable>/gtk-2.0/gtkrc"
     215gtk-icon-theme-name = "<replaceable>hicolor</replaceable>"</literal>
    216216EOF</userinput></screen>
    217217
    … …  
    229229
    230230<screen role="root"><userinput>cat &gt; /etc/gtk-2.0/gtkrc &lt;&lt; "EOF"
    231 include "/usr/share/themes/<replaceable>Clearlooks</replaceable>/gtk-2.0/gtkrc"
    232 gtk-icon-theme-name = "<replaceable>elementary</replaceable>"
     231<literal>include "/usr/share/themes/<replaceable>Clearlooks</replaceable>/gtk-2.0/gtkrc"
     232gtk-icon-theme-name = "<replaceable>elementary</replaceable>"</literal>
    233233EOF</userinput></screen>
    234234

  • x/lib/gtk+3.xml

    re77adf7 r51dfb3e  
    103103
    104104    <bridgehead renderas="sect4">Optional</bridgehead>
    105     <para role="optional" revision="sysv">
    106       <xref linkend="colord"/>,
    107       <xref linkend="cups"/>,
    108       <xref linkend="docbook-utils"/>,
    109       <xref linkend="gtk-doc"/>,
    110       <xref linkend="json-glib"/>,
    111       <ulink url="http://icl.cs.utk.edu/papi/">PAPI</ulink>, and
    112       <ulink url="http://ftp.acc.umu.se/pub/gnome/sources/rest/">rest</ulink>
    113     </para>
    114     <para role="optional" revision="systemd">
     105    <para role="optional">
    115106      <xref linkend="colord"/>,
    116107      <xref linkend="cups"/>,

  • x/lib/gtk-vnc.xml

    re77adf7 r51dfb3e  
    1313]>
    1414
    15 <sect1 id="gtk-vnc" xreflabel="gtk-vnc-&gtk-vnc-version;" revision="systemd">
     15<sect1 id="gtk-vnc" xreflabel="gtk-vnc-&gtk-vnc-version;">
    1616  <?dbhtml filename="gtk-vnc.html"?>
    1717

  • xfce/core/xfce4-session.xml

    re77adf7 r51dfb3e  
    144144      There are several optional run time dependencies for
    145145      <application>Xfce4</application>:
    146       <phrase revision="sysv"><xref linkend="consolekit"/>,</phrase>
    147146      <xref linkend="dbus"/>,
    148147      <xref linkend="gnupg2"/>,
    … …  
    150149      <xref linkend="openssh"/>
    151150    </para>
    152 <!--
    153     <para>
    154       To launch <application>Xfce4</application> use the command
    155       <command>startxfce4</command>. If you have <xref linkend="consolekit"/>
    156       installed, use <command>startxfce4 -\-with-ck-launch</command>.
    157       <application>ConsoleKit</application> is required to perform any
    158       task that requires administrative access, including shut down
    159       and reboot.
    160     </para>-->
    161151
    162152    <para>
    … …  
    187177    <para revision="systemd">
    188178      You can start <application>Xfce4</application> from a TTY using
    189       <xref linkend="xinit"/><!--, or from a graphical display manager, such as
    190       <xref linkend="lightdm"/>-->.
     179      <xref linkend="xinit"/>, or from a graphical display manager, such as
     180      <xref linkend="lightdm"/>.
    191181    </para>
    192182
    … …  
    196186    </para>
    197187
    198 <screen revision="sysv"><userinput>cat &gt; ~/.xinitrc &lt;&lt; "EOF"
    199 <literal>ck-launch-session dbus-launch --exit-with-session startxfce4</literal>
    200 EOF
    201 
    202 startx</userinput></screen>
    203 
    204 <screen revision="systemd"><userinput>cat &gt; ~/.xinitrc &lt;&lt; "EOF"
     188<screen><userinput>cat &gt; ~/.xinitrc &lt;&lt; "EOF"
    205189<literal>dbus-launch --exit-with-session startxfce4</literal>
    206190EOF

  • xsoft/graphweb/seamonkey.xml

    re77adf7 r51dfb3e  
    409409
    410410cat &gt; /usr/share/applications/seamonkey.desktop &lt;&lt; "EOF"
    411 [Desktop Entry]
     411<literal>[Desktop Entry]
    412412Encoding=UTF-8
    413413Type=Application
    … …  
    418418Categories=Network;GTK;Application;Email;Browser;WebBrowser;News;
    419419StartupNotify=true
    420 Terminal=false
     420Terminal=false</literal>
    421421EOF
    422422
Note: See TracChangeset for help on using the changeset viewer.