Merge pull request #30284 from YHNdnzj/fstab-wantedby-defaultdeps

[thirdparty/systemd.git] / man / networkd.conf.xml

diff --git a/man/networkd.conf.xml b/man/networkd.conf.xml
index 9668aed6149a6142be24076753f65eb6f103beb6..27cab25d88f19c3e08f52fda58e043abc11a829d 100644 (file)
--- a/man/networkd.conf.xml
+++ b/man/networkd.conf.xml
@@ -27,9 +27,11 @@
   </refnamediv>
 
   <refsynopsisdiv>
-    <para><filename>/etc/systemd/networkd.conf</filename></para>
-    <para><filename>/etc/systemd/networkd.conf.d/*.conf</filename></para>
-    <para><filename>/usr/lib/systemd/networkd.conf.d/*.conf</filename></para>
+    <para><simplelist>
+      <member><filename>/etc/systemd/networkd.conf</filename></member>
+      <member><filename>/etc/systemd/networkd.conf.d/*.conf</filename></member>
+      <member><filename>/usr/lib/systemd/networkd.conf.d/*.conf</filename></member>
+    </simplelist></para>
   </refsynopsisdiv>
 
   <refsect1>
@@ -90,6 +92,17 @@
         <xi:include href="version-info.xml" xpointer="v246"/></listitem>
       </varlistentry>
 
+      <varlistentry>
+        <term><varname>ManageForeignNextHops=</varname></term>
+        <listitem><para>A boolean. When true, <command>systemd-networkd</command> will remove nexthops
+        that are not configured in .network files (except for routes with protocol
+        <literal>kernel</literal>). When false, it will
+        not remove any foreign nexthops, keeping them even if they are not configured in a .network file.
+        Defaults to yes.</para>
+
+        <xi:include href="version-info.xml" xpointer="v256"/></listitem>
+      </varlistentry>
+
       <varlistentry>
         <term><varname>RouteTable=</varname></term>
         <listitem><para>Defines the route table name. Takes a whitespace-separated list of the pairs of
@@ -147,7 +160,9 @@
             <literal>43793</literal> as the vendor identifier (systemd) and hashed contents of
             <citerefentry><refentrytitle>machine-id</refentrytitle><manvolnum>5</manvolnum></citerefentry>.
             This is the default if <varname>DUIDType=</varname> is not specified.
-            </para></listitem>
+            </para>
+
+            <xi:include href="version-info.xml" xpointer="v230"/></listitem>
           </varlistentry>
 
           <varlistentry>
@@ -158,7 +173,9 @@
             <citerefentry><refentrytitle>machine-id</refentrytitle><manvolnum>5</manvolnum></citerefentry>
             is used as a DUID value. About the application-specific machine ID, see
             <citerefentry><refentrytitle>sd_id128_get_machine_app_specific</refentrytitle><manvolnum>3</manvolnum></citerefentry>.
-            </para></listitem>
+            </para>
+
+            <xi:include href="version-info.xml" xpointer="v230"/></listitem>
           </varlistentry>
 
           <varlistentry>
@@ -168,13 +185,17 @@
             then the MAC address of the interface is used as a DUID value. The value <literal>link-layer-time</literal>
             can take additional time value after a colon, e.g. <literal>link-layer-time:2018-01-23 12:34:56 UTC</literal>.
             The default time value is <literal>2000-01-01 00:00:00 UTC</literal>.
-            </para></listitem>
+            </para>
+
+            <xi:include href="version-info.xml" xpointer="v240"/></listitem>
           </varlistentry>
         </variablelist>
         </para>
 
         <para>In all cases, <varname>DUIDRawData=</varname> can be used to override the
-        actual DUID value that is used.</para></listitem>
+        actual DUID value that is used.</para>
+
+        <xi:include href="version-info.xml" xpointer="v230"/></listitem>
       </varlistentry>
 
       <varlistentry>
@@ -203,6 +224,8 @@ DUIDRawData=00:00:ab:11:f9:2a:c2:77:29:f9:5c:00</programlisting>
           43793 (<literal>00:00:ab:11</literal>), and identifier value <literal>f9:2a:c2:77:29:f9:5c:00</literal>.
           </para>
         </example>
+
+          <xi:include href="version-info.xml" xpointer="v230"/>
         </listitem>
       </varlistentry>
     </variablelist>