Author: dj
Date: Fri Jun  3 17:20:01 2016
New Revision: 17429

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

Modified:
   trunk/BOOK/general/sysutils/acpid.xml
   trunk/BOOK/general/sysutils/at.xml
   trunk/BOOK/general/sysutils/autofs.xml
   trunk/BOOK/general/sysutils/bluez.xml
   trunk/BOOK/general/sysutils/dbus.xml
   trunk/BOOK/general/sysutils/fcron.xml
   trunk/BOOK/general/sysutils/gpm.xml
   trunk/BOOK/general/sysutils/sysstat.xml

Modified: trunk/BOOK/general/sysutils/acpid.xml
==============================================================================
--- trunk/BOOK/general/sysutils/acpid.xml       Fri Jun  3 12:35:48 2016        
(r17428)
+++ trunk/BOOK/general/sysutils/acpid.xml       Fri Jun  3 17:20:01 2016        
(r17429)
@@ -149,7 +149,8 @@
       <para>
         To automatically start <command>acpid</command> when the system is
         rebooted, install the <filename>/etc/rc.d/init.d/acpid</filename>
-        boot script from the <xref linkend="bootscripts"/> package.
+        boot script from the <xref linkend="bootscripts" revision="sysv"/>
+        <xref linkend="systemd-units" revision="systemd"/> package.
       </para>
 
       <indexterm zone="acpid acpid-init">

Modified: trunk/BOOK/general/sysutils/at.xml
==============================================================================
--- trunk/BOOK/general/sysutils/at.xml  Fri Jun  3 12:35:48 2016        (r17428)
+++ trunk/BOOK/general/sysutils/at.xml  Fri Jun  3 17:20:01 2016        (r17429)
@@ -149,7 +149,8 @@
       <title>Boot Script</title>
 
       <para>Install the <filename>/etc/init.d/atd</filename> init script from
-      the <xref linkend="bootscripts"/> package.</para>
+      the <xref linkend="bootscripts" revision="sysv"/>
+      <xref linkend="systemd-units" revision="systemd"/> package.</para>
 
       <indexterm zone="at at-init">
         <primary sortas="f-at">at</primary>

Modified: trunk/BOOK/general/sysutils/autofs.xml
==============================================================================
--- trunk/BOOK/general/sysutils/autofs.xml      Fri Jun  3 12:35:48 2016        
(r17428)
+++ trunk/BOOK/general/sysutils/autofs.xml      Fri Jun  3 17:20:01 2016        
(r17429)
@@ -250,7 +250,8 @@
       BLFS scripts.</para>
 
       <para>Install the <filename>/etc/init.d/autofs</filename> mount script
-      included with the <xref linkend="bootscripts"/> package.</para>
+      included with the <xref linkend="bootscripts" revision="sysv"/>
+      <xref linkend="systemd-units" revision="systemd"/> package.</para>
 
       <indexterm zone="autofs autofs-init">
         <primary sortas="f-autofs-init">autofs</primary>

Modified: trunk/BOOK/general/sysutils/bluez.xml
==============================================================================
--- trunk/BOOK/general/sysutils/bluez.xml       Fri Jun  3 12:35:48 2016        
(r17428)
+++ trunk/BOOK/general/sysutils/bluez.xml       Fri Jun  3 17:20:01 2016        
(r17429)
@@ -242,7 +242,8 @@
         To automatically start the <command>bluetoothd</command> daemon when 
the
         system is rebooted, install the
         <filename>/etc/rc.d/init.d/bluetooth</filename> bootscript from the
-        <xref linkend="bootscripts"/> package.
+        <xref linkend="bootscripts" revision="sysv"/>
+        <xref linkend="systemd-units" revision="systemd"/> package.
       </para>
 
       <indexterm zone="bluez bluez-init">

Modified: trunk/BOOK/general/sysutils/dbus.xml
==============================================================================
--- trunk/BOOK/general/sysutils/dbus.xml        Fri Jun  3 12:35:48 2016        
(r17428)
+++ trunk/BOOK/general/sysutils/dbus.xml        Fri Jun  3 17:20:01 2016        
(r17429)
@@ -29,7 +29,7 @@
   <sect2 role="package">
     <title>Introduction to D-Bus</title>
 
-    <para>
+    <para revision="sysv">
       <application>D-Bus</application> is a message bus system, a simple way
       for applications to talk to one another.
       <application>D-Bus</application> supplies both a system daemon (for
@@ -41,6 +41,12 @@
       message bus daemon).
     </para>
 
+    <para revision="systemd">
+      Even though <application>D-Bus</application> was built in LFS, there are
+      some features provided by the package that other BLFS packages need, but
+      their dependencies didn't fit into LFS.
+    </para>
+
     &lfs79_checked;&gcc6_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -131,7 +137,7 @@
       <command>configure</command> command shown below):
     </para>
 
-<screen><userinput>./configure --prefix=/usr                  \
+<screen revision="sysv"><userinput>./configure --prefix=/usr                  \
             --sysconfdir=/etc              \
             --localstatedir=/var           \
             --disable-doxygen-docs         \
@@ -143,10 +149,32 @@
             --docdir=/usr/share/doc/dbus-&dbus-version;   &amp;&amp;
 make</userinput></screen>
 
+<screen revision="systemd"><userinput>./configure --prefix=/usr                
  \
+            --sysconfdir=/etc              \
+            --localstatedir=/var           \
+            --disable-doxygen-docs         \
+            --disable-xml-docs             \
+            --disable-static               \
+            --with-console-auth-dir=/run/console/ \
+            --docdir=/usr/share/doc/dbus-&dbus-version;   &amp;&amp;
+make</userinput></screen>
+
     <para>
       See below for test instructions.
     </para>
 
+    <warning revision="systemd">
+      <para>
+        Installing the package will override all files installed by
+        <application>D-Bus</application> in LFS. It is critical that
+        nothing uses <application>D-Bus</application> libraries or
+        programs during the installation phrase. Best way to achieve
+        that is to do the installation in the rescue mode. To switch
+        to the rescue mode, issue the following command as the
+        <systemitem class="username">root</systemitem> user from a TTY:
+      </para>
+    </warning>
+
     <para>
       Now, as the <systemitem class="username">root</systemitem> user:
     </para>
@@ -174,6 +202,15 @@
 
 <screen role="root"><userinput>dbus-uuidgen --ensure</userinput></screen>
 
+    <para revision="systemd">
+      If not in chroot, at this point, you should reload the systemd daemon,
+      and reenter multi-user mode with the following commands (as the
+      <systemitem class="username">root</systemitem> user):
+    </para>
+
+<screen role="root" revision="systemd"><userinput>systemctl daemon-reload
+systemctl start multi-user.target</userinput></screen>
+
     <para>
       The dbus tests cannot be run until after <xref linkend="dbus-glib"/> has
       been installed.  They must be run as an unprivileged user from a local
@@ -242,12 +279,12 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
       href="../../xincludes/static-libraries.xml"/>
 
-    <para>
+    <para revision="sysv">
       <parameter>--disable-systemd</parameter>: This switch disables systemd
       support in <application>D-Bus</application>.
     </para>
 
-    <para>
+    <para revision="sysv">
       <parameter>--without-systemdsystemunitdir</parameter>: This switch
       prevents installation of systemd unit files.
     </para>
@@ -343,23 +380,23 @@
 
     </sect3>
 
-    <sect3  id="dbus-init">
-      <title>Boot Script</title>
+    <sect3  id="dbus-init" revision="sysv">
+      <title>D-Bus Session Daemon</title>
 
-      <para>
+      <para revision="sysv">
         To automatically start <command>dbus-daemon</command> when the
         system is rebooted, install the
         <filename>/etc/rc.d/init.d/dbus</filename> bootscript from the
         <xref linkend="bootscripts"/> package.
       </para>
 
-      <indexterm zone="dbus dbus-init">
+      <indexterm zone="dbus dbus-init" revision="sysv">
         <primary sortas="f-dbus">dbus</primary>
       </indexterm>
 
-<screen role="root"><userinput>make install-dbus</userinput></screen>
+<screen role="root" revision="sysv"><userinput>make 
install-dbus</userinput></screen>
 
-      <para>
+      <para revision="sysv">
         Note that this boot script only starts the system-wide
         <application>D-Bus</application> daemon. Each user requiring access to
         <application>D-Bus</application> services will also need to run a
@@ -370,6 +407,15 @@
         examples:
       </para>
 
+      <para revision="systemd">
+        There are many methods you can use to start a session daemon
+        using the <command>dbus-launch</command> command. Review the
+        <command>dbus-launch</command> man page for details about the
+        available parameters and options. Here are some suggestions and
+        examples:
+      </para>
+
+
       <itemizedlist spacing="compact">
         <listitem>
           <para>
@@ -429,7 +475,7 @@
 
   </sect2>
 
-  <sect2 role="content">
+  <sect2 role="content" revision="sysv">
     <title>Contents</title>
 
     <segmentedlist>
@@ -599,6 +645,18 @@
     </variablelist>
 
   </sect2>
+  
+  <sect2 role="content" revision="systemd">
+    <title>Contents</title>
+
+      <para>
+        A list of the installed files, along with their short
+        descriptions can be found at
+        <ulink url="&lfs-root;/chapter06/dbus.html#contents-dbus"/>.
+      </para>
+
+  </sect2>
+
 
 </sect1>
 

Modified: trunk/BOOK/general/sysutils/fcron.xml
==============================================================================
--- trunk/BOOK/general/sysutils/fcron.xml       Fri Jun  3 12:35:48 2016        
(r17428)
+++ trunk/BOOK/general/sysutils/fcron.xml       Fri Jun  3 17:20:01 2016        
(r17429)
@@ -122,7 +122,7 @@
     <para>Install <application>Fcron</application> by running the following
     commands:</para>
 
-<screen><userinput>./configure --prefix=/usr          \
+<screen revision="sysv"><userinput>./configure --prefix=/usr          \
             --sysconfdir=/etc      \
             --localstatedir=/var   \
             --without-sendmail     \
@@ -130,6 +130,13 @@
             --with-systemdsystemunitdir=no &amp;&amp;
 make</userinput></screen>
 
+<screen revision="systemd"><userinput>./configure --prefix=/usr          \
+            --sysconfdir=/etc      \
+            --localstatedir=/var   \
+            --without-sendmail     \
+            --with-boot-install=no &amp;&amp;
+make</userinput></screen>
+
     <para>This package does not come with a test suite.</para>
 
     <para>Now, as the <systemitem class="username">root</systemitem> 
user:</para>
@@ -158,9 +165,9 @@
     <para><parameter>--with-boot-install=no</parameter>: This prevents
     installation of the bootscript included with the package.</para>
 
-    <para><parameter>--with-systemdsystemunitdir=no|yes|DIR</parameter>: Use
-    no, if you use sysvint; yes, if you use systemd, or specify the directory
-    DIR for the systemd units.</para>
+    <para 
revision="sysv"><parameter>--with-systemdsystemunitdir=no|yes|DIR</parameter>:
+    Use no, if you use sysvint; yes, if you use systemd, or specify the
+    directory for the systemd units.</para>
 
     
<para><option>--with-editor=<replaceable>&lt;/path/to/editor&gt;</replaceable></option>:
     This switch allows you to set the default text editor.</para>
@@ -229,7 +236,8 @@
       <title>Boot Script</title>
 
       <para>Install the <filename>/etc/rc.d/init.d/fcron</filename>
-      init script from the <xref linkend="bootscripts"/>
+      init script from the <xref linkend="bootscripts" revision="sysv"/>
+      <xref linkend="systemd-units" revision="systemd"/>
       package.</para>
 
       <indexterm zone="fcron fcron-init">

Modified: trunk/BOOK/general/sysutils/gpm.xml
==============================================================================
--- trunk/BOOK/general/sysutils/gpm.xml Fri Jun  3 12:35:48 2016        (r17428)
+++ trunk/BOOK/general/sysutils/gpm.xml Fri Jun  3 17:20:01 2016        (r17429)
@@ -124,7 +124,8 @@
       </indexterm>
 
       <para>Install the <filename>/etc/rc.d/init.d/gpm</filename> init script
-      included in the <xref linkend="bootscripts"/> package.</para>
+      included in the <xref linkend="bootscripts" revision="sysv"/>
+      <xref linkend="systemd-units" revision="systemd"/> package.</para>
 
 <screen role="root"><userinput>make install-gpm</userinput></screen>
 

Modified: trunk/BOOK/general/sysutils/sysstat.xml
==============================================================================
--- trunk/BOOK/general/sysutils/sysstat.xml     Fri Jun  3 12:35:48 2016        
(r17428)
+++ trunk/BOOK/general/sysutils/sysstat.xml     Fri Jun  3 17:20:01 2016        
(r17429)
@@ -176,7 +176,8 @@
       <para>At system startup, a LINUX RESTART message must be inserted in the
       daily data file to reinitialize the kernel counters. This can be
       automated by installing the <filename>/etc/rc.d/init.d/sysstat</filename>
-      init script included in the <xref linkend="bootscripts"/>
+      init script included in the <xref linkend="bootscripts" revision="sysv"/>
+      <xref linkend="systemd-units" revision="systemd"/>
       package using the following command as the
       <systemitem class="username">root</systemitem> user:</para>
 
-- 
http://lists.linuxfromscratch.org/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page

Reply via email to