Author: dj
Date: Fri Jun 10 23:14:15 2016
New Revision: 17479

Log:
[Systemd merge] - Chapter 16

Modified:
   trunk/BOOK/networking/netutils/avahi.xml
   trunk/BOOK/networking/netutils/networkmanager.xml
   trunk/BOOK/networking/netutils/wicd.xml

Modified: trunk/BOOK/networking/netutils/avahi.xml
==============================================================================
--- trunk/BOOK/networking/netutils/avahi.xml    Fri Jun 10 22:26:20 2016        
(r17478)
+++ trunk/BOOK/networking/netutils/avahi.xml    Fri Jun 10 23:14:15 2016        
(r17479)
@@ -123,7 +123,7 @@
     commands:</para>
 
 <!-- final part of sed removes " -DGDK_DISABLE_DEPRECATED=1 
-DGTK_DISABLE_DEPRECATED=1 \" -->
-<screen><userinput>./configure --prefix=/usr        \
+<screen revision="sysv"><userinput>./configure --prefix=/usr        \
             --sysconfdir=/etc    \
             --localstatedir=/var \
             --disable-static     \
@@ -137,6 +137,20 @@
             --with-systemdsystemunitdir=no &amp;&amp;
 make</userinput></screen>
 
+<screen revision="sysstemd"><userinput>./configure --prefix=/usr        \
+            --sysconfdir=/etc    \
+            --localstatedir=/var \
+            --disable-static     \
+            --disable-mono       \
+            --disable-monodoc    \
+            --disable-python     \
+            --disable-qt3        \
+            --disable-qt4        \
+            --enable-core-docs   \
+            --with-distro=none   \
+            --with-systemdsystemunitdir=/lib/systemd/system &amp;&amp;
+make</userinput></screen>
+
     <para>
       This package does not come with a test suite.
     </para>
@@ -191,12 +205,18 @@
       boot script in the distribution for LFS. This option disables it.
     </para>
 
-    <para>
+    <para revision="sysv">
       <parameter>--with-systemdsystemunitdir=no</parameter>: Without it, the
       daemon fails to start in BLFS, which does not support
       <application>systemd</application>.
     </para>
 
+    <para revision="systemd">
+      <parameter>--with-systemdsystemunitdir=/lib/systemd/system</parameter>:
+      This parameter is used to set the correct installation directory for
+      systemd units.
+    </para>
+
     <para>
       <option>--disable-dbus</option>: This parameter disables the use
       of <application>D-Bus</application>.
@@ -241,19 +261,34 @@
     <sect3  id="avahi-init">
       <title>Boot Script</title>
 
-      <para>
+      <para revision="sysv">
         To automatically start the <command>avahi-daemon</command>
         when the system is rebooted, install the
         <filename>/etc/rc.d/init.d/avahi</filename> bootscript from
-        the <xref linkend="bootscripts" revision="sysv"/>
-        <xref linkend="systemd-units" revision="systemd"/> package.
+        the <xref linkend="bootscripts"/> package.
+      </para>
+
+      <para revision="systemd">
+        To start the <command>avahi-daemon</command> daemon at boot, enable
+        the previously installed systemd unit by running the following command
+        as the <systemitem class="username">root</systemitem> user:
       </para>
 
       <indexterm zone="avahi avahi-init">
         <primary sortas="f-avahi">avahi</primary>
       </indexterm>
 
-<screen role="root"><userinput>make install-avahi</userinput></screen>
+<screen role="root" revision="sysv"><userinput>make 
install-avahi</userinput></screen>
+
+<screen role="root" revision="systemd"><userinput>systemctl enable 
avahi-daemon</userinput></screen>
+
+      <para revision="systemd">
+        To start the <command>avahi-dnsconfd</command> daemon at boot, enable
+        the previously installed systemd unit by running the following command
+        as the <systemitem class="username">root</systemitem> user:
+      </para>
+
+<screen role="root" revision="systemd"><userinput>systemctl enable 
avahi-dnsconfd</userinput></screen>
 
     </sect3>
 

Modified: trunk/BOOK/networking/netutils/networkmanager.xml
==============================================================================
--- trunk/BOOK/networking/netutils/networkmanager.xml   Fri Jun 10 22:26:20 
2016        (r17478)
+++ trunk/BOOK/networking/netutils/networkmanager.xml   Fri Jun 10 23:14:15 
2016        (r17479)
@@ -41,6 +41,14 @@
 
     &lfs79_checked;&gcc6_checked;
 
+    <note revision="systemd">
+      <para>
+        Make sure that you disable the <command>systemd-networkd</command>
+        service or configure it not to manage the interfaces you want to manage
+        with <application>NetworkManager</application>.
+      </para>
+    </note>
+
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
       <listitem>
@@ -96,6 +104,7 @@
       <xref linkend="libsoup"/>,
       <xref linkend="newt"/> (for <command>nmtui</command>),
       <xref linkend="polkit"/>,
+      <phrase revision="systemd"><xref linkend="systemd"/>,</phrase>
       <xref linkend="upower"/>,
       <xref linkend="vala"/>, and
       <xref linkend="wpa_supplicant"/> (built with D-Bus support),
@@ -106,10 +115,15 @@
       <xref linkend="bluez"/>,
       <xref linkend="gtk-doc"/>,
       <xref linkend="qt5"/> (for examples),
+      <phrase revision="systemd"><xref linkend="ModemManager"/>,</phrase>
+      <phrase revision="systemd"><xref linkend="pygobject3"/>,</phrase>
       <xref linkend="valgrind"/>,
-      <ulink url="http://libteam.org/";>libteam</ulink>, and
-      <ulink url="http://www.freedesktop.org/software/ModemManager/";>
-      ModemManager</ulink>
+      <ulink url="http://libteam.org/";>libteam</ulink>,
+      <phrase revision="sysv"><ulink 
+      url="http://www.freedesktop.org/software/ModemManager/";>
+      ModemManager</ulink>,</phrase>
+      <ulink url="https://www.samba.org/ftp/ppp/";>PPP</ulink>, and
+      <ulink 
url="https://www.roaringpenguin.com/products/pppoe";>RP-PPPoE</ulink>
     </para>
 
     <para condition="html" role="usernotes">User Notes:
@@ -132,7 +146,7 @@
       following commands:
     </para>
 
-<screen><userinput>CXXFLAGS="-O2 -fPIC"             \
+<screen revision="sysv"><userinput>CXXFLAGS="-O2 -fPIC"             \
 ./configure --prefix=/usr        \
             --sysconfdir=/etc    \
             --localstatedir=/var \
@@ -142,6 +156,17 @@
             --docdir=/usr/share/doc/network-manager-&NetworkManager-version; 
&amp;&amp;
 make</userinput></screen>
 
+<screen revision="systemd"><userinput>CXXFLAGS="-O2 -fPIC"                     
                   \
+./configure --prefix=/usr                                   \
+            --sysconfdir=/etc                               \
+            --localstatedir=/var                            \
+            --with-nmtui                                    \
+            --disable-ppp                                   \
+            --with-session-tracking=systemd                 \
+            --with-systemdsystemunitdir=/lib/systemd/system \
+            --docdir=/usr/share/doc/network-manager-&NetworkManager-version; 
&amp;&amp;
+make</userinput></screen>
+
     <para>
       An already active graphical session with bus address is necessary to run
       the tests. To test the results, issue: <command>make check</command>.
@@ -168,12 +193,24 @@
       <command>nmtui</command>.
     </para>
 
-    <para>
+    <para revision="systemd">
+      <parameter>--with-session-tracking=systemd</parameter>: This switch
+      is used to set <command>systemd-logind</command> as the default
+      program for session tracking.
+    </para>
+
+    <para revision="sysv">
       <parameter>--with-systemdsystemunitdir=no</parameter>: This parameter is
       used for sysv init systems. If you use systemd, replace "no" by the
       proper directory.
     </para>
 
+    <para revision="systemd">
+      <parameter>--with-systemdsystemunitdir=/lib/systemd/system</parameter>:
+      This switch is used to set the correct installation directory for
+      systemd units.
+    </para>
+
     <para>
       <parameter>--disable-ppp</parameter>: This parameter disables parameteral
       <application>PPP</application> support in
@@ -235,21 +272,40 @@
     </sect3>
 
     <sect3 id="NetworkManager-init">
-      <title>Boot Script</title>
+      <title><phrase revision="sysv">Boot Script</phrase>
+             <phrase revision="systemd">Systemd Unit</phrase></title>
 
-      <para>
-        To automatically start the <command>NetworkManager</command> daemon 
when the
-        system is rebooted, install the
-        <filename>/etc/rc.d/init.d/networkmanager</filename> bootscript from 
the
-        <xref linkend="bootscripts" revision="sysv"/>
-        <xref linkend="systemd-units" revision="systemd"/> package.
+      <para revision="sysv">
+        To automatically start the <command>NetworkManager</command> daemon
+        when the system is rebooted, install the
+        <filename>/etc/rc.d/init.d/networkmanager</filename>bootscript from 
the 
+        <xref linkend="bootscripts"/> package.
+      </para>
+
+      <para revision="systemd">
+        To start the <command>NetworkManager</command> daemon at boot, enable
+        the previously installed systemd unit by running the following command
+        as the <systemitem class="username">root</systemitem> user:
       </para>
 
       <indexterm zone="NetworkManager NetworkManager-init">
         <primary sortas="f-NetworkManager">NetworkManager</primary>
       </indexterm>
 
-<screen role="root"><userinput>make install-networkmanager</userinput></screen>
+<screen role="root" revision="sysv"><userinput>make 
install-networkmanager</userinput></screen>
+
+<screen role="root" revision="systemd"><userinput>systemctl enable 
NetworkManager</userinput></screen>
+
+      <para revision="systemd">
+        <application>NetworkManager</application> also ships a systemd unit
+        called <filename>NetworkManager-wait-online.service</filename> which
+        can be used to prevent services that require network connectivity
+        from starting until <application>NetworkManager</application> has
+        established the connection. To enable it, run the following command
+        as the <systemitem class="username">root</systemitem> user:
+      </para>
+
+<screen role="root" revision="systemd"><userinput>systemctl enable 
NetworkManager-wait-online</userinput></screen>
 
     </sect3>
 

Modified: trunk/BOOK/networking/netutils/wicd.xml
==============================================================================
--- trunk/BOOK/networking/netutils/wicd.xml     Fri Jun 10 22:26:20 2016        
(r17478)
+++ trunk/BOOK/networking/netutils/wicd.xml     Fri Jun 10 23:14:15 2016        
(r17479)
@@ -192,9 +192,18 @@
     <sect3 id="wicd-init">
       <title>Configuration Information</title>
 
+      <note revision="systemd">
+        <para>
+          Make sure that you disable the <command>systemd-networkd</command>
+          service or configure it not to manage the interfaces you want to
+          manage with <application>Wicd</application>.
+        </para>
+      </note>
+
       <para>To automatically start Wicd at boot time, you need to first install
-      the Wicd bootscript,
-      <filename>/etc/rc.d/init.d/wicd</filename>,
+      the Wicd bootscript,<phrase revision="sysv">
+      <filename>/etc/rc.d/init.d/wicd</filename></phrase>
+      <phrase revision="systemd"><filename>wicd.service</filename></phrase>,
       included in the <xref linkend="bootscripts" revision="sysv"/>
       <xref linkend="systemd-units" revision="systemd"/> package
       (as user <systemitem class="username">root</systemitem>):</para>
@@ -205,22 +214,25 @@
 
       <screen role='root'><userinput>make install-wicd</userinput></screen>
 
-      <para>Since Wicd will now handle all configuration of network devices,
-      the network bootscript installed by LFS should be disabled. This can be
-      achieved by either removing any <filename>S*network</filename> and
-      <filename>K*network</filename> symlinks in the 
<filename>/etc/rc*.d</filename>
-      directories or by setting <literal>ONBOOT=no</literal> in any
+      <para revision="sysv">Since Wicd will now handle all configuration of
+      network devices, the network bootscript installed by LFS should be
+      disabled. This can be achieved by either removing any
+      <filename>S*network</filename> and <filename>K*network</filename>
+      symlinks in the <filename>/etc/rc*.d</filename> directories or by setting
+      <literal>ONBOOT=no</literal> in any
       <filename>/etc/sysconfig/ifconfig.*</filename> files.</para>
 
       <para>No manual configuration of Wicd is needed if you use the graphical
-      frontends. If you are only going to use Wicd from command-line, you can 
configure
-      it using the configuration files in <filename>/etc/wicd</filename>. For 
a list of
-      available options, look at the man-pages for: wicd-manager-settings.conf,
-      wicd-wired-settings.conf and wicd-wireless-settings.conf.</para>
-
-      <para>Be sure to add all users who are to have rights to open and close 
network
-      connections with Wicd to the <systemitem 
class="groupname">users</systemitem>
-      group (or the group specified with the <option>--wicdgroup</option> 
configuration
+      frontends. If you are only going to use Wicd from command-line, you can
+      configure it using the configuration files in
+      <filename>/etc/wicd</filename>. For a list of available options, look at
+      the man-pages for: wicd-manager-settings.conf, wicd-wired-settings.conf
+      and wicd-wireless-settings.conf.</para>
+
+      <para>Be sure to add all users who are to have rights to open and close
+      network connections with Wicd to the
+      <systemitem class="groupname">users</systemitem> group (or the group
+      specified with the <option>--wicdgroup</option> configuration
       option).</para>
 
     </sect3>
-- 
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