Merge pull request #21629 from yuwata/man-netdev-update

man: netdev: several cleanups

man/systemd.netdev.xml

@@ -456,24 +456,14 @@
       </varlistentry>
       <varlistentry>
         <term><varname>EgressQOSMaps=</varname></term>
-        <listitem>
-          <para>Defines a mapping of Linux internal packet priority (<constant>SO_PRIORITY</constant>) to VLAN header
-          PCP field for outgoing frames. Takes a whitespace-separated list of unsigned integer pairs in the format
-          <literal>from</literal>-<literal>to</literal>, e.g., <literal>21-7 45-5</literal> ranges 1–4294967294.
-          Note that <literal>from</literal> must be greater than or equal to <literal>to</literal>. When unset,
-          the kernel's default will be used.
-          </para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
         <term><varname>IngressQOSMaps=</varname></term>
         <listitem>
-          <para>Defines a mapping of Linux internal packet priority (<constant>SO_PRIORITY</constant>) to VLAN header
-          PCP field for incoming frames. Takes a whitespace-separated list of unsigned integer pairs in the format
-          <literal>from</literal>-<literal>to</literal>, e.g., <literal>21-7 45-5</literal> ranges 1–4294967294.
-          Note that <literal>from</literal> must be greater than or equal to <literal>to</literal>. When unset,
-          the kernel's default will be used.
-          </para>
+          <para>Defines a mapping of Linux internal packet priority (<constant>SO_PRIORITY</constant>)
+          to VLAN header PCP field for outgoing and incoming frames, respectively. Takes a
+          whitespace-separated list of integer pairs, where each integer must be in the range
+          1…4294967294, in the format <literal>from</literal>-<literal>to</literal>, e.g.,
+          <literal>21-7 45-5</literal>. Note that <literal>from</literal> must be greater than or equal
+          to <literal>to</literal>. When unset, the kernel's default will be used.</para>
         </listitem>
       </varlistentry>
     </variablelist>
@@ -1230,7 +1220,7 @@
           value of zero means that a packet carrying that option may not enter
           another tunnel before exiting the current tunnel.
           (see <ulink url="https://tools.ietf.org/html/rfc2473#section-4.1.1"> RFC 2473</ulink>).
-          The valid range is 0–255 and <literal>none</literal>. Defaults to 4.
+          The valid range is 0…255 and <literal>none</literal>. Defaults to 4.
         </para>
         </listitem>
       </varlistentry>
@@ -1769,7 +1759,7 @@
         <listitem>
           <para>Specifies the delay before a link is enabled after a
           link up status has been detected. This value is rounded down
-          to a multiple of MIIMonitorSec. The default value is
+          to a multiple of <varname>MIIMonitorSec=</varname>. The default value is
           0.</para>
         </listitem>
       </varlistentry>
@@ -1779,7 +1769,7 @@
         <listitem>
           <para>Specifies the delay before a link is disabled after a
           link down status has been detected. This value is rounded
-          down to a multiple of MIIMonitorSec. The default value is
+          down to a multiple of <varname>MIIMonitorSec=</varname>. The default value is
           0.</para>
         </listitem>
       </varlistentry>
@@ -1789,7 +1779,7 @@
         <listitem>
           <para>Specifies the number of seconds between instances where the bonding
           driver sends learning packets to each slave peer switch.
-          The valid range is 1–0x7fffffff; the default value is 1. This option
+          The valid range is 1…0x7fffffff; the default value is 1. This option
           has an effect only for the balance-tlb and balance-alb modes.</para>
         </listitem>
       </varlistentry>
@@ -1870,8 +1860,8 @@
         <term><varname>ARPIPTargets=</varname></term>
         <listitem>
           <para>Specifies the IP addresses to use as ARP monitoring peers when
-          ARPIntervalSec is greater than 0. These are the targets of the ARP request
-          sent to determine the health of the link to the targets.
+          <varname>ARPIntervalSec=</varname> is greater than 0. These are the targets of the ARP
+          request sent to determine the health of the link to the targets.
           Specify these values in IPv4 dotted decimal format. At least one IP
           address must be given for ARP monitoring to function. The
           maximum number of targets that can be specified is 16. The
@@ -1883,7 +1873,7 @@
       <varlistentry>
         <term><varname>ARPAllTargets=</varname></term>
         <listitem>
-          <para>Specifies the quantity of ARPIPTargets that must be reachable
+          <para>Specifies the quantity of <varname>ARPIPTargets=</varname> that must be reachable
           in order for the ARP monitor to consider a slave as being up.
           This option affects only active-backup mode for slaves with
           ARPValidate enabled. Possible values are
@@ -1914,7 +1904,7 @@
           <para>Specifies the number of IGMP membership reports to be issued after
           a failover event. One membership report is issued immediately after
           the failover, subsequent packets are sent in each 200ms interval.
-          The valid range is 0–255. Defaults to 1. A value of 0
+          The valid range is 0…255. Defaults to 1. A value of 0
           prevents the IGMP membership report from being issued in response
           to the failover event.
           </para>
@@ -1926,7 +1916,7 @@
         <listitem>
           <para>Specify the number of packets to transmit through a slave before
           moving to the next one. When set to 0, then a slave is chosen at
-          random. The valid range is 0–65535. Defaults to 1. This option
+          random. The valid range is 0…65535. Defaults to 1. This option
           only has effect when in balance-rr mode.
           </para>
         </listitem>
@@ -1941,7 +1931,7 @@
           a peer notification is sent on the  bonding device and each
           VLAN sub-device.  This is repeated at each link monitor interval
           (ARPIntervalSec or MIIMonitorSec, whichever is active) if the number is
-          greater than 1. The valid range is 0–255. The default value is 1.
+          greater than 1. The valid range is 0…255. The default value is 1.
           These options affect only the active-backup mode.
           </para>
         </listitem>

man/systemd.network.xml

@@ -518,18 +518,14 @@ Table=1234</programlisting></para>
         <varlistentry>
           <term><varname>DNSOverTLS=</varname></term>
           <listitem>
-            <para>Takes a boolean or <literal>opportunistic</literal>.
-            When true, enables
-            <ulink
-            url="https://tools.ietf.org/html/rfc7858">DNS-over-TLS</ulink>
-            support on the link.
-            When set to <literal>opportunistic</literal>, compatibility with
-            non-DNS-over-TLS servers is increased, by automatically
-            turning off DNS-over-TLS servers in this case.
-            This option defines a per-interface setting for
+            <para>Takes a boolean or <literal>opportunistic</literal>. When true, enables
+            <ulink url="https://tools.ietf.org/html/rfc7858">DNS-over-TLS</ulink> support on the link.
+            When set to <literal>opportunistic</literal>, compatibility with non-DNS-over-TLS servers
+            is increased, by automatically turning off DNS-over-TLS servers in this case. This option
+            defines a per-interface setting for
             <citerefentry><refentrytitle>resolved.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>'s
-            global <varname>DNSOverTLS=</varname> option. Defaults to
-            false. This setting is read by
+            global <varname>DNSOverTLS=</varname> option. Defaults to unset, and the global setting
+            will be used. This setting is read by
             <citerefentry><refentrytitle>systemd-resolved.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>.</para>
           </listitem>
         </varlistentry>
@@ -537,16 +533,15 @@ Table=1234</programlisting></para>
           <term><varname>DNSSEC=</varname></term>
           <listitem>
             <para>Takes a boolean or <literal>allow-downgrade</literal>. When true, enables
-            <ulink url="https://tools.ietf.org/html/rfc4033">DNSSEC</ulink>
-            DNS validation support on the link. When set to
-            <literal>allow-downgrade</literal>, compatibility with
-            non-DNSSEC capable networks is increased, by automatically
-            turning off DNSSEC in this case. This option defines a
-            per-interface setting for
+            <ulink url="https://tools.ietf.org/html/rfc4033">DNSSEC</ulink> DNS validation support on
+            the link. When set to <literal>allow-downgrade</literal>, compatibility with non-DNSSEC
+            capable networks is increased, by automatically turning off DNSSEC in this case. This
+            option defines a per-interface setting for
             <citerefentry><refentrytitle>resolved.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>'s
-            global <varname>DNSSEC=</varname> option. Defaults to
-            false. This setting is read by
-            <citerefentry><refentrytitle>systemd-resolved.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>.</para>
+            global <varname>DNSSEC=</varname> option. Defaults to unset, and the global setting will be
+            used. This setting is read by
+            <citerefentry><refentrytitle>systemd-resolved.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>.
+            </para>
           </listitem>
         </varlistentry>
         <varlistentry>

meson.build

@@ -1526,8 +1526,7 @@ conf.set_quoted('DEFAULT_LLMNR_MODE_STR', default_llmnr)
 
 want_repart = get_option('repart')
 if want_repart != 'false'
-        have = (conf.get('HAVE_OPENSSL') == 1 and
-                conf.get('HAVE_LIBFDISK') == 1)
+        have = conf.get('HAVE_LIBFDISK') == 1
         if want_repart == 'true' and not have
                 error('repart support was requested, but dependencies are not available')
         endif
@@ -2931,8 +2930,7 @@ if conf.get('ENABLE_REPART') == 1
                 link_with : [libshared],
                 dependencies : [threads,
                                 libblkid,
-                                libfdisk,
-                                libopenssl],
+                                libfdisk],
                 install_rpath : rootlibexecdir,
                 install : true,
                 install_dir : rootbindir)