Merge pull request #17643 from keszybz/man-news-independent

NEWS and man page tweaks

NEWS

@@ -457,9 +457,7 @@ CHANGES WITH 247 in spe:
           discipline in the [FlowQueuePIE] sections.
 
         * systemd-networkd's .netdev files may now be used to create "BareUDP"
-          tunnels, configured in the new [BareUDP] setting. VXLAN tunnels may
+          tunnels, configured in the new [BareUDP] setting.
-          now be marked to be independent of any underlying network interface
-          via the new Independent= boolean setting.
 
         * systemd-networkd's Gateway= setting in .network files now accepts the
           special values "_dhcp4" and "_ipv6ra" to configure additional,
@@ -482,9 +480,8 @@ CHANGES WITH 247 in spe:
           prefix will be announced through IPv6 router advertisement (IPv6 RA).
           The setting is enabled by default.
 
-        * systemd-networkd's .netdev files gained the Independent= boolean
+        * VXLAN tunnels may now be marked as independent of any underlying
-          setting in [VXLAN] section. When enabled, the vxlan interface will be
+          network interface via the new Independent= boolean setting.
-          created without underlying interfaces. Defaults to false.
 
         * systemctl gained support for two new verbs: "service-log-level" and
           "service-log-target" may be used on services that implement the

man/systemd.netdev.xml

@@ -84,7 +84,7 @@
         </row></thead>
         <tbody>
           <row><entry><varname>bond</varname></entry>
-          <entry>A bond device is an aggregation of all its slave devices. See <ulink url="https://www.kernel.org/doc/Documentation/networking/bonding.txt">Linux Ethernet Bonding Driver HOWTO</ulink> for details.Local configuration</entry></row>
+          <entry>A bond device is an aggregation of all its slave devices. See <ulink url="https://www.kernel.org/doc/Documentation/networking/bonding.txt">Linux Ethernet Bonding Driver HOWTO</ulink> for details.</entry></row>
 
           <row><entry><varname>bridge</varname></entry>
           <entry>A bridge device is a software switch, and each of its slave devices and the bridge itself are ports of the switch.</entry></row>
@@ -754,7 +754,8 @@
       <varlistentry>
         <term><varname>Id=</varname></term>
         <listitem>
-          <para>Specifies the Virtual Network Identifier (VNI) to use. Ranges [0-16777215]. This field is mandatory.</para>
+          <para>Specifies the Virtual Network Identifier (VNI) to use, a number between 0 and 16777215. This
+          field is mandatory.</para>
         </listitem>
       </varlistentry>
       <varlistentry>
@@ -766,7 +767,7 @@
       <varlistentry>
         <term><varname>TOS=</varname></term>
         <listitem>
-          <para>Specifies the TOS value to use in outgoing packets. Ranges [1-255].</para>
+          <para>Specifies the TOS value to use in outgoing packets. Takes a number between 1 and 255.</para>
         </listitem>
       </varlistentry>
       <varlistentry>
@@ -818,8 +819,9 @@
       <varlistentry>
         <term><varname>Independent=</varname></term>
         <listitem>
-          <para>Takes a boolean. When true, the vxlan interface is created without underlying interfaces.
+          <para>Takes a boolean. When true, the vxlan interface is created without any underlying network
-          Defaults to <literal>false</literal>.</para>
+          interface. Defaults to false, which means that a .network file that requests this tunnel using
+          <varname>Tunnel=</varname> is required for the tunnel to be created.</para>
         </listitem>
       </varlistentry>
     </variablelist>
@@ -1276,9 +1278,10 @@
       <varlistentry>
         <term><varname>Independent=</varname></term>
         <listitem>
-          <para>Takes a boolean. When true tunnel does not require .network file. Created as "tunnel@NONE".
+          <para>Takes a boolean. When false (the default), the tunnel is always created over some network
-          Defaults to <literal>false</literal>.
+          device, and a .network file that requests this tunnel using <varname>Tunnel=</varname> is required
-          </para>
+          for the tunnel to be created. When true, the tunnel is created independently of any network as
+          "tunnel@NONE".</para>
         </listitem>
       </varlistentry>
       <varlistentry>
@@ -1770,8 +1773,8 @@
       <varlistentry>
         <term><varname>AdActorSystem=</varname></term>
         <listitem>
-          <para>Specifies the 802.3ad system mac address. This can not be either
+          <para>Specifies the 802.3ad system MAC address. This cannot be a null or multicast address.
-          <constant>NULL</constant> or <constant>Multicast</constant>.</para>
+          </para>
         </listitem>
       </varlistentry>
 
@@ -1948,10 +1951,8 @@
       <varlistentry>
         <term><varname>Independent=</varname></term>
         <listitem>
-          <para>Takes a boolean. If set to <literal>no</literal>, the xfrm interface should have an
+          <para>Takes a boolean. If false (the default), the xfrm interface must have an underlying device
-          underlying device which can be used for hardware offloading. Defaults to <literal>no</literal>.
+          which can be used for hardware offloading.</para>
-          See <citerefentry><refentrytitle>systemd.network</refentrytitle><manvolnum>5</manvolnum></citerefentry>
-          for how to configure the underlying device.</para>
         </listitem>
       </varlistentry>
     </variablelist>

src/network/netdev/bond.c

@@ -469,7 +469,7 @@ int config_parse_ad_actor_system(
         }
         if (ether_addr_is_null(&n) || (n.ether_addr_octet[0] & 0x01)) {
                 log_syntax(unit, LOG_WARNING, filename, line, 0,
-                           "Not a valid MAC address %s, can not be null or multicast. Ignoring assignment.",
+                           "Not an appropriate MAC address %s, cannot be null or multicast. Ignoring assignment.",
                            rvalue);
                 return 0;
         }

src/network/netdev/netdev.c

@@ -649,7 +649,7 @@ int netdev_join(NetDev *netdev, Link *link, link_netlink_message_handler_t callb
                         return r;
                 break;
         default:
-                assert_not_reached("Can not join independent netdev");
+                assert_not_reached("Cannot join independent netdev");
         }
 
         return 0;