network: make IPMasquerade= imply global IP forwarding settings again

After 3976c43092 (#31423), IPMasquerade=
implies only per-interface IP forwarding. That means, nspawn users need
to manually enable IPv4/IPv6Forwarding= in networkd.conf when
--network-veth or friend is used. Even the change was announced in NEWS,
the change itself breaks backward compatibility and extremely reduces
usability.

Let's make the setting imply the global setting again.

Fixes #34010.
This commit is contained in:
Yu Watanabe
2024-08-17 00:13:06 +09:00
parent 8ceca83141
commit 0b695febb2
3 changed files with 83 additions and 10 deletions
+9 -9
View File
@@ -888,15 +888,15 @@ DuplicateAddressDetection=none</programlisting></para>
<literal>ipv6</literal>, <literal>both</literal>, or <literal>no</literal>. Defaults to
<literal>no</literal>. Note. Any positive boolean values such as <literal>yes</literal> or
<literal>true</literal> are now deprecated. Please use one of the values above. Specifying
<literal>ipv4</literal> or <literal>both</literal> implies <varname>IPv4Forwarding=</varname>,
unless it is explicitly specified. Similarly for <varname>IPv6Forwarding=</varname> when
<literal>ipv6</literal> or <literal>both</literal> is specified. These implications are only on
this interface. Hence, to make the IP packet forwarding works,
<varname>IPv4Forwarding=</varname>/<varname>IPv6Forwarding=</varname> need to be enabled on an
upstream interface, or globally enabled by specifying them in
<citerefentry><refentrytitle>networkd.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>.
See <varname>IPv4Forwarding=</varname>/<varname>IPv6Forwarding=</varname> in the above for more
details.</para>
<literal>ipv4</literal> or <literal>both</literal> implies <varname>IPv4Forwarding=</varname>
settings in both .network file for this interface and the global
<citerefentry><refentrytitle>networkd.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>
unless they are explicitly specified. Similarly for <varname>IPv6Forwarding=</varname> when
<literal>ipv6</literal> or <literal>both</literal> is specified. See
<varname>IPv4Forwarding=</varname>/<varname>IPv6Forwarding=</varname> in the above for the per-link
settings, and
<citerefentry><refentrytitle>networkd.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>
for the global settings.</para>
<xi:include href="version-info.xml" xpointer="v219"/>
</listitem>