Changeset f1ce80b

Timestamp:

06/04/2016 03:04:06 AM (7 years ago)

Author:

DJ Lucas <dj@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 7.10, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, ken/inkscape-core-mods, lazarus, nosym, perl-modules, plabs/python-mods, qt5new, trunk, upgradedb, xry111/intltool, xry111/soup3, xry111/test-20220226

Children:

ce9b131

Parents:

787a2e75

Message:

[systemd-merge] - Section II layout

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

Files:

• lxde/desktop/lxde-common.xml (modified) (2 diffs)
• lxde/desktop/lxsession.xml (modified) (3 diffs)
• lxqt/desktop/lxqt-common.xml (modified) (1 diff)
• lxqt/desktop/post-install.xml (modified) (1 diff)
• multimedia/libdriv/pulseaudio.xml (modified) (1 diff)
• networking/netutils/networkmanager.xml (modified) (1 diff)
• packages.ent (modified) (1 diff)
• postlfs/config/config.xml (modified) (2 diffs)
• postlfs/config/random.xml (modified) (2 diffs)
• postlfs/security/consolekit.xml (modified) (1 diff)
• postlfs/security/liboauth.xml (added)
• postlfs/security/security.xml (modified) (2 diffs)
• x/dm/lxdm.xml (modified) (1 diff)
• x/dm/sddm.xml (modified) (1 diff)
• xfce/core/xfce4-session.xml (modified) (1 diff)
• xsoft/other/gparted.xml (modified) (1 diff)

lxde/desktop/lxde-common.xml

@@ -75 +75 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="consolekit"/>,
+      <phrase revision="sysv"><xref linkend="consolekit"/>,</phrase>
       <xref linkend="lxde-icon-theme"/>,
       <xref linkend="lxpanel"/>,
@@ -92 +92 @@
     <bridgehead renderas="sect4">Recommended Runtime Dependencies</bridgehead>
     <para role="recommended">
-      <xref linkend="consolekit"/> and
+      <phrase revision="sysv"><xref linkend="consolekit"/> and</phrase>
       <xref linkend="dbus"/>
     </para>

lxde/desktop/lxsession.xml

@@ -71 +71 @@
     </itemizedlist>
 
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
+    <bridgehead renderas="sect3" revision="sysv">Additional Downloads</bridgehead>
+    <itemizedlist spacing="compact" revision="sysv">
       <listitem>
         <para>
@@ -95 +95 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="consolekit"/> (used at runtime by
-      <command>lxsession-logout</command>),
+      <phrase revision="sysv"><xref linkend="consolekit"/> (used at runtime by
+      <command>lxsession-logout</command>),</phrase>
       <xref linkend="gtk3"/>, and
       <xref linkend="libxslt"/> with
@@ -111 +111 @@
     <title>Installation of LXSession</title>
 
-    <para>
+    <para revision="sysv">
       Optionally apply the following patch to be able to put your system
       into <quote>Suspend</quote> or <quote>Hibernate</quote> state.
     </para>
 
-<screen><userinput>patch -Np1 -i ../lxsession-&lxsession-version;-hibernate_consolekit-2.patch</userinput></screen>
+<screen revision="sysv"><userinput>patch -Np1 -i ../lxsession-&lxsession-version;-hibernate_consolekit-2.patch</userinput></screen>
 
     <para>

lxqt/desktop/lxqt-common.xml

@@ -83 +83 @@
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
-      <xref linkend="consolekit"/> alone or with
+      <phrase revision="sysv"><xref linkend="consolekit"/> alone or with</phrase>
       <xref linkend="lxdm"/> or another Display Manager, e.g.
       <xref linkend="sddm"/> (this has been

lxqt/desktop/post-install.xml

@@ -38 +38 @@
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
-      <xref linkend="consolekit"/> alone or with
+      <phrase revision="sysv"><xref linkend="consolekit"/> alone or with</phrase>
       <xref linkend="sddm"/> (this has been
       reported as the <quote>recommended <application>LXQt</application>

multimedia/libdriv/pulseaudio.xml

@@ -100 +100 @@
       <xref linkend="bluez"/> (runtime),
       <xref linkend="check"/>,
-      <xref linkend="consolekit"/> (runtime),
+      <phrase revision="sysv"><xref linkend="consolekit"/> (runtime),</phrase>
       <xref linkend="GConf"/>,
       <xref linkend="gtk3"/>,

networking/netutils/networkmanager.xml

@@ -89 +89 @@
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
-      <xref linkend="consolekit"/>,
+      <phrase revision="sysv"><xref linkend="consolekit"/>,</phrase>
       <xref linkend="dhcpcd"/> or
       <xref linkend="dhcp"/> (client only),

packages.ent

@@ -19 +19 @@
 <!ENTITY iptables-version             "1.6.0">
 <!ENTITY libcap-version               "2.25">
+<!ENTITY liboauth-version             "1.0.3">
 <!ENTITY linux-pam-version            "1.3.0">
 <!ENTITY linux-pam-docs-version       "1.2.0">

postlfs/config/config.xml

@@ -41 +41 @@
 
   <para> The remaining topics, <xref linkend="postlfs-config-logon"/>,
-  <xref linkend="postlfs-config-random"/>,
+  <phrase revision="sysv"><xref linkend="postlfs-config-random"/>,</phrase>
   <xref linkend="autofs"/>, and
   <xref linkend="postlfs-config-netfs"/> are then addressed, in that order. They
@@ -54 +54 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="vimrc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="logon.xml"/>
+
+  <!-- sysv only -->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="random.xml"/>
+
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lsb-release.xml"/>
 

postlfs/config/random.xml

@@ -6 +6 @@
 ]>
 
-<sect1 id="postlfs-config-random" xreflabel="Random number generation">
+<sect1 id="postlfs-config-random" xreflabel="Random number generation" revision="sysv">
   <?dbhtml filename="random.html"?>
 
@@ -34 +34 @@
 
   <para>Install the <filename>/etc/rc.d/init.d/random</filename> init script
-  included with the <xref linkend="bootscripts" revision="sysv"/>
-  <xref linkend="systemd-units" revision="systemd"/> package.</para>
+  included with the <xref linkend="bootscripts"/> package.</para>
 
 <screen role="root"><userinput>make install-random</userinput></screen>

postlfs/security/consolekit.xml

@@ -13 +13 @@
 ]>
 
-<sect1 id="consolekit" xreflabel="ConsoleKit2-&consolekit-version;">
+<sect1 id="consolekit" xreflabel="ConsoleKit2-&consolekit-version;" revision="sysv">
   <?dbhtml filename="consolekit.html"?>
 

postlfs/security/security.xml

@@ -43 +43 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="vulnerabilities.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cacerts.xml"/>
+
+  <!-- sysv only -->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="consolekit.xml"/>
+
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cracklib.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cyrus-sasl.xml"/>
@@ -54 +57 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libcap.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="linux-pam.xml"/>
+
+  <!-- systemd only -->
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="liboauth.xml"/>
+
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libpwquality.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mitkrb.xml"/>

x/dm/lxdm.xml

@@ -89 +89 @@
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
-     <xref linkend="consolekit"/> and
+     <phrase revision="sysv"><xref linkend="consolekit"/> and</phrase>
      <xref linkend="linux-pam"/>
     </para>

x/dm/sddm.xml

@@ -95 +95 @@
     </para>
 
-    <bridgehead renderas="sect4">Runtime Dependencies</bridgehead>
-    <para role="required">
+    <bridgehead renderas="sect4" revision="sysv">Runtime Dependencies</bridgehead>
+    <para role="required" revision="sysv">
       <xref linkend="consolekit"/>
     </para>

xfce/core/xfce4-session.xml

@@ -144 +144 @@
       There are several optional run time dependencies for
       <application>Xfce4</application>:
-      <xref linkend="consolekit"/>,
+      <phrase revision="sysv"><xref linkend="consolekit"/>,</phrase>
       <xref linkend="dbus"/>,
       <xref linkend="gnupg2"/>,

xsoft/other/gparted.xml

@@ -186 +186 @@
     </sect3>
 
-    <sect3 role="pkexec">
+    <sect3 role="pkexec" revision="sysv">
       <title>pkexec</title>
         <para>