Changeset 10a6c8d


Ignore:
Timestamp:
07/20/2014 12:47:07 PM (10 years ago)
Author:
Krejzi <krejzi@…>
Branches:
systemd-11177
Children:
e39afa06
Parents:
1b90889
Message:

Merge some more of Christopher's work into systemd branch.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/branches/systemd@13500 af4574ff-66df-0310-9fd7-8a98e5e911e0

Files:
1 added
1 deleted
4 edited
1 moved

Legend:

Unmodified
Added
Removed

  • general/sysutils/systemd.xml

    r1b90889 r10a6c8d  
    188188        installation in the rescue mode. To switch to the rescue mode,
    189189        issue the following command as the
    190         <systemitem class="username">root</systemitem> from a TTY:
     190        <systemitem class="username">root</systemitem> user from a TTY:
    191191      </para>
    192192

  • general/sysutils/sysutils.xml

    r1b90889 r10a6c8d  
    2626  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="colord-systemd.xml"/>
    2727  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cpio.xml"/>
    28   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dbus.xml"/>
     28  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dbus-systemd.xml"/>
    2929  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="fcron-systemd.xml"/>
    3030  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gpm.xml"/>

  • networking/netutils/avahi-systemd.xml

    r1b90889 r10a6c8d  
    138138            --disable-qt4        \
    139139            --enable-core-docs   \
    140             --with-distro=none &amp;&amp;
     140            --with-distro=none   \
     141            --with-systemdsystemunitdir=/lib/systemd/system &amp;&amp;
    141142make</userinput></screen>
    142143
    … …  
    197198
    198199    <para>
     200      <parameter>--with-systemdsystemunitdir=/lib/systemd/system</parameter>:
     201      This parameter is used to set the correct installation directory for
     202      systemd units.
     203    </para>
     204
     205    <para>
    199206      <parameter>--with-distro=none</parameter>: There is an obsolete
    200207      boot script in the distribution for LFS. This option disables it.
    … …  
    240247
    241248  <sect2 role="configuration">
    242     <title>Configuring avahi</title>
     249    <title>Configuring Avahi</title>
    243250
    244251    <sect3  id="avahi-init">
    245       <title>Boot Script</title>
     252      <title>Systemd Units</title>
    246253
    247254      <para>
    248         To automatically start the <command>avahi-daemon</command>
    249         when the system is rebooted, install the
    250         <filename>/etc/rc.d/init.d/avahi</filename> bootscript from
    251         the <xref linkend="bootscripts"/> package.
     255        To start the <command>avahi-daemon</command> daemon at boot, enable
     256        the previously installed systemd unit by running the following command
     257        as the <systemitem class="username">root</systemitem> user:
    252258      </para>
    253259
    … …  
    256262      </indexterm>
    257263
    258 <screen role="root"><userinput>make install-avahi</userinput></screen>
     264<screen role="root"><userinput>systemctl enable avahi-daemon</userinput></screen>
     265
     266      <para>
     267        To start the <command>avahi-dnsconfd</command> daemon at boot, enable
     268        the previously installed systemd unit by running the following command
     269        as the <systemitem class="username">root</systemitem> user:
     270      </para>
     271
     272<screen role="root"><userinput>systemctl enable avahi-dnsconfd</userinput></screen>
    259273
    260274    </sect3>
    … …  
    271285
    272286      <seglistitem>
    273         <seg>avahi-autoipd, avahi-bookmarks, avahi-browse, avahi-browse-domains,
    274         avahi-daemon, avahi-discover, avahi-discover-standalone, avahi-dnsconfd,
    275         avahi-publish, avahi-publish-address, avahi-publish-service,
    276         avahi-resolve, avahi-resolve-address, avahi-resolve-host-name,
    277         avahi-set-host-name, bshell, bssh, and bvnc</seg>
    278         <seg>libavahi-client.so, libavahi-common.so,
    279         libavahi-core.so, libavahi-glib.so, libavahi-gobject.so,
    280         libavahi-ui-gtk3.so,, libavahi-ui.so, libdns_sd.so, and
    281         libhowl.so,</seg>
    282         <seg>/etc/avahi/services, /usr/{include/{avahi-client,avahi-common,
    283         avahi-compat-howl/{corby,discovery,rendezvous,salt},
    284         avahi-compat-libdns_sd,avahi-core,avahi-glib,avahi-gobject,avahi-ui},
    285         lib/{avahi,python&python2-majorver;/site-packages/{avahi,
    286         avahi_discover}},share/{avahi/interfaces,locale/en_NZ/LC_MESSAGES}}</seg>
     287        <seg>
     288          avahi-autoipd, avahi-bookmarks, avahi-browse, avahi-browse-domains,
     289          avahi-daemon, avahi-discover, avahi-discover-standalone, avahi-dnsconfd,
     290          avahi-publish, avahi-publish-address, avahi-publish-service,
     291          avahi-resolve, avahi-resolve-address, avahi-resolve-host-name,
     292          avahi-set-host-name, bshell, bssh, and bvnc
     293        </seg>
     294        <seg>
     295          libavahi-client.so, libavahi-common.so,libavahi-core.so,
     296          libavahi-glib.so, libavahi-gobject.so, libavahi-ui-gtk3.so,
     297          libavahi-ui.so, libdns_sd.so, and libhowl.so
     298        </seg>
     299        <seg>
     300          /etc/avahi,
     301          /usr/include/{avahi-client,avahi-common,avahi-compat-howl},
     302          /usr/include/{avahi-compat-libdns_sd,avahi-core,avahi-glib}
     303          /usr/include/{avahi-gobject,avahi-ui},
     304          /usr/lib/avahi,
     305          /usr/lib/python&python2-majorver;/site-packages/{avahi,avahi_discover}, and
     306          /usr/share/avahi
     307        </seg>
    287308      </seglistitem>
    288309    </segmentedlist>

  • networking/netutils/netutils.xml

    r1b90889 r10a6c8d  
    2222  <ulink url="&blfs-wiki;/basicnetworkingutilities"/></para>
    2323
    24   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="avahi.xml"/>
     24  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="avahi-systemd.xml"/>
    2525  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bind-utils.xml"/>
    2626  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mod_dnssd.xml"/>

  • networking/netutils/networkmanager-systemd.xml

    r1b90889 r10a6c8d  
    102102    <bridgehead renderas="sect4">Optional</bridgehead>
    103103    <para role="optional">
     104      <xref linkend="bluez"/> (runtime),
    104105      <xref linkend="gtk-doc"/>,
    105106      <xref linkend="qt4"/>,
    … …  
    119120    <title>Installation of NetworkManager</title>
    120121
    121     <para>
    122       If <xref linkend="qt4"/> and  <xref linkend="qt5"/> are installed, you
    123       need to choose <application>Qt4</application> with
    124       <command>source setqt4</command>, before starting. Install
    125       <application>NetworkManager</application> by running the following
    126       commands:
    127     </para>
    128 
    129 <screen><userinput>./configure --prefix=/usr        \
    130             --sysconfdir=/etc    \
    131             --localstatedir=/var \
    132             --with-nmtui         \
    133             --disable-ppp        \
    134             --with-systemdsystemunitdir=no &amp;&amp;
     122<screen><userinput>./configure --prefix=/usr                   \
     123            --sysconfdir=/etc               \
     124            --localstatedir=/var            \
     125            --disable-ppp                   \
     126            --with-nmtui                    \
     127            --with-session-tracking=systemd \
     128            --with-systemdsystemunitdir=/lib/systemd/system &amp;&amp;
    135129make</userinput></screen>
    136130
    … …  
    152146
    153147    <para>
    154       <parameter>--with-nmtui</parameter>: This parameter enables build of
    155       <command>nmtui</command>.
    156     </para>
    157 
    158     <para>
    159       <parameter>--with-systemdsystemunitdir=no</parameter>: This parameter is
    160       used for sysv init systems. If you use systemd, replace "no" by the
    161       proper directory.
    162     </para>
    163 
    164     <para>
    165       <parameter>--disable-ppp</parameter>: This parameter disables parameteral
     148      <parameter>--disable-ppp</parameter>: This switch disables
    166149      <application>PPP</application> support in
    167       <application>NetworkManager</application>.
     150      <application>NetworkManager</application> because
     151      <application>PPP</application> isn't part of BLFS.
     152    </para>
     153
     154    <para>
     155      <parameter>--with-nmtui</parameter>: This switch enables building
     156      of the <command>nmtui</command> program. Remove it if you have
     157      not installed <xref linkend="newt"/>.
     158    </para>
     159
     160    <para>
     161      <parameter>--with-session-tracking=systemd</parameter>: This switch
     162      is used to set <command>systemd-logind</command> as the default
     163      program for session tracking.
     164    </para>
     165
     166    <para>
     167      <parameter>--with-systemdsystemunitdir=/lib/systemd/system</parameter>:
     168      This switch is used to set the correct installation directory for
     169      systemd units.
    168170    </para>
    169171
    … …  
    190192
    191193      <indexterm zone="NetworkManager NetworkManager-config">
    192         <primary
    193         sortas="e-etc-NetworkManager-NetworkManager.conf">
     194        <primary sortas="e-etc-NetworkManager-NetworkManager.conf">
    194195        /etc/NetworkManager/NetworkManager.conf</primary>
    195196      </indexterm>
    … …  
    200201
    201202      <para>
    202         For <application>NetworkManager</application> to work, at least
    203         minimal configuration file must be present. Such file is not
    204         installed with <command>make install</command>. Issue following
     203        For <application>NetworkManager</application> to work, at least a
     204        basic configuration file must be present. Such file is not
     205        installed with <command>make install</command>. Run the following
    205206        command as the
    206         <systemitem class="username">root</systemitem> user to create
    207         minimal <filename>NetworkManager.conf</filename> file:
     207        <systemitem class="username">root</systemitem> user to create a
     208        basic <filename>NetworkManager.conf</filename> file:
    208209      </para>
    209210
    … …  
    214215
    215216      <para>
    216         You can add <option>dns=none</option> to suppress changes to
     217         You can add <option>dns=none</option> to suppress changes to
    217218         <filename>/etc/resolv.conf</filename>. See
    218219         <command>man 5 NetworkManager.conf</command>
    … …  
    223224
    224225    <sect3 id="NetworkManager-init">
    225       <title>Boot Script</title>
     226      <title>Systemd Units</title>
    226227
    227228      <para>
    228         To automatically start the <command>NetworkManager</command> daemon when the
    229         system is rebooted, install the
    230         <filename>/etc/rc.d/init.d/networkmanager</filename> bootscript from the
    231         <xref linkend="bootscripts"/> package.
     229        To start the <command>NetworkManager</command> daemon at boot, enable
     230        the previously installed systemd unit by running the following command
     231        as the <systemitem class="username">root</systemitem> user:
    232232      </para>
    233233
    … …  
    236236      </indexterm>
    237237
    238 <screen role="root"><userinput>make install-networkmanager</userinput></screen>
     238<screen role="root"><userinput>systemctl enable NetworkManager</userinput></screen>
     239
     240      <para>
     241        <application>NetworkManager</application> also ships a systemd unit
     242        called <filename>NetworkManager-wait-online.service</filename> which
     243        can be used to prevent services that require network connectivity
     244        from starting until <application>NetworkManager</application> has
     245        established the connection. To enable it, run the following command
     246        as the <systemitem class="username">root</systemitem> user:
     247      </para>
     248
     249<screen role="root"><userinput>systemctl enable NetworkManager-wait-online</userinput></screen>
    239250
    240251    </sect3>
    … …  
    252263      <seglistitem>
    253264        <seg>
    254           NetworkManager, nm-avahi-autoipd.action, nm-dhcp-helper,
    255           nm-dispatcher, nm-online, nmcli, and, hardlinked to each other:
    256           nmtui, nmtui-connect, nmtui-edit, and nmtui-hostname
     265          NetworkManager, nm-online, nmcli, nmtui, nmtui-connect,
     266          nmtui-edit, and nmtui-hostname
    257267        </seg>
    258268        <seg>
    259           libnm-glib.so, libnm-glib-vpn.so, libnm-util.so, and
    260           modules under /usr/lib/NetworkManager
     269          libnm-glib.so, libnm-glib-vpn.so, and libnm-util.so
    261270        </seg>
    262271        <seg>
    … …  
    310319        <listitem>
    311320          <para>
    312             interactive ncurses based interface for
     321            is an interactive ncurses based interface for
    313322            <application>nmcli</application>.
    314323          </para>
    … …  
    323332        <listitem>
    324333          <para>
    325             interactive ncurses based interface connection activate/deactivate.
     334            is an interactive ncurses based interface connection
     335            activate/deactivate.
    326336          </para>
    327337          <indexterm zone="NetworkManager nmtui-connect">
    … …  
    335345        <listitem>
    336346          <para>
    337             interactive ncurses based interface connection editor.
     347            is an interactive ncurses based interface connection
     348            editor.
    338349          </para>
    339350          <indexterm zone="NetworkManager nmtui-edit">
    … …  
    347358        <listitem>
    348359          <para>
    349             interactive ncurses based interface hostname editor.
     360            is an interactive ncurses based interface hostname
     361            editor.
    350362          </para>
    351363          <indexterm zone="NetworkManager nmtui-hostname">
Note: See TracChangeset for help on using the changeset viewer.