X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fsystemd.netdev.xml;h=0a2cbab09398e355bb03d4b192898a7d00971063;hb=e432f9e8f999fe75d79a2499035c8e84b04a8b1a;hp=64987980a73b7d4c6461e4c4822dde2238adbadc;hpb=72d33d99c5dda1aedf2e18b08236b86ecf5f520b;p=elogind.git

diff --git a/man/systemd.netdev.xml b/man/systemd.netdev.xml
index 64987980a..0a2cbab09 100644
--- a/man/systemd.netdev.xml
+++ b/man/systemd.netdev.xml
@@ -60,7 +60,10 @@
 
                 <para>Virtual Network Device files must have the extension
                 <filename>.netdev</filename>; other extensions are ignored. Virtual
-                network devices are created as soon as networkd is started.</para>
+                network devices are created as soon as networkd is started. If a netdev
+                with the specified name already exists, networkd will use that as-is
+                rather than create its own. Note that the settings of the pre-existing
+                netdev will not be changed by networkd.</para>
 
                 <para>The <filename>.netdev</filename> files are read from the files located in the
                 system network directory <filename>/usr/lib/systemd/network</filename>,
@@ -163,7 +166,8 @@
                                                 <literal>macvlan</literal>, <literal>vxlan</literal>,
                                                 <literal>ipip</literal>, <literal>gre</literal>,
                                                 <literal>sit</literal>, <literal>vti</literal>,
-                                                <literal>veth</literal>, and <literal>dummy</literal>
+                                                <literal>veth</literal>, <literal>tun</literal>,
+                                                <literal>tap</literal> and <literal>dummy</literal>
                                                 are supported. This option is compulsory.</para>
                                         </listitem>
                                 </varlistentry>
@@ -366,7 +370,7 @@
                                         <listitem><para>Takes a boolean argument. Configures whether packets
                                         should be prepened with four extra bytes (two flag bytes and two
                                         protocol bytes). If disabled it indicates that the packets will be
-                                        pure IP packets. Defaults to <literal>yes</literal>.</para>
+                                        pure IP packets. Defaults to <literal>no</literal>.</para>
                                         </listitem>
                                 </varlistentry>
                                 <varlistentry>
@@ -394,6 +398,30 @@
                         <literal>[Tun]</literal> section.</para>
         </refsect1>
 
+        <refsect1>
+                <title>[Bond] Section Options</title>
+
+                        <para>The <literal>[Bond]</literal> section accepts the following
+                        key:</para>
+
+                        <variablelist class='network-directives'>
+                                <varlistentry>
+                                        <term><varname>Mode=</varname></term>
+                                        <listitem>
+                                          <para>Specifies one of the bonding policies. The default is balance-rr (round robin).
+                                                <literal>balance-rr</literal>
+                                                <literal>active-backup</literal>
+                                                <literal>balance-xor</literal>
+                                                <literal>broadcast</literal>
+                                                <literal>802.3ad</literal>
+                                                <literal>balance-tlb</literal>
+                                                <literal>balance-alb</literal>
+                                          </para>
+                                        </listitem>
+                                </varlistentry>
+                        </variablelist>
+        </refsect1>
+
         <refsect1>
                 <title>Example</title>
                 <example>