From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Wed, 20 Dec 2023 10:12:34 +0000 (+0900)
Subject: man,NEWS: mention that all previously assigned VLAN IDs are cleared
X-Git-Tag: v256-rc1~1446^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=03a46b5ecabce700c198fda5e849336dc61910a5;p=thirdparty%2Fsystemd.git

man,NEWS: mention that all previously assigned VLAN IDs are cleared

Addresses https://github.com/systemd/systemd/pull/29987#issuecomment-1863934902.
---

diff --git a/NEWS b/NEWS
index f5d0df58b53..b1e7779b602 100644
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,12 @@ CHANGES WITH 256 in spe:
 
         Announcements of Future Feature Removals and Incompatible Changes:
 
+        * Previously, systemd-networkd did not explicitly remove any bridge VLAN
+          IDs assigned on bridge master and ports. Since v256, if a .network
+          file for an interface has at least one valid settings in [BridgeVLAN]
+          section, then all assigned VLAN IDs on the interface that are not
+          configured in the .network file are removed.
+
 CHANGES WITH 255:
 
         Announcements of Future Feature Removals and Incompatible Changes:
diff --git a/man/systemd.network.xml b/man/systemd.network.xml
index cf26a24405b..7dc447d0a7f 100644
--- a/man/systemd.network.xml
+++ b/man/systemd.network.xml
@@ -5865,10 +5865,17 @@ ServerAddress=192.168.0.1/24</programlisting>
 
   <refsect1>
     <title>[BridgeVLAN] Section Options</title>
-    <para>The [BridgeVLAN] section manages the VLAN ID configuration of a bridge port and accepts the
-    following keys. Specify several [BridgeVLAN] sections to configure several VLAN entries. The
-    <varname>VLANFiltering=</varname> option has to be enabled, see the [Bridge] section in
-    <citerefentry><refentrytitle>systemd.netdev</refentrytitle><manvolnum>5</manvolnum></citerefentry>.</para>
+    <para>
+      The [BridgeVLAN] section manages the VLAN ID configurations of a bridge master or port, and accepts the
+      following keys. To make the settings in this section take an effect,
+      <varname>VLANFiltering=</varname> option has to be enabled on the bridge master, see the [Bridge]
+      section in
+      <citerefentry><refentrytitle>systemd.netdev</refentrytitle><manvolnum>5</manvolnum></citerefentry>.
+      If at least one valid settings specified in this section in a .network file for an interface, all
+      assigned VLAN IDs on the interface that are not configured in the .network file will be removed. If
+      VLAN IDs on an interface need to be managed by other tools, then the settings in this section cannot
+      be used in the matching .network file.
+    </para>
 
     <variablelist class='network-directives'>
       <varlistentry>