networkd: rename section [BridgePort] → [Bridge]

Let's stick to generic sections that describe the general technology,
instead of specific per-object sections, unless we really have a reason
to do that otherwise.

diff --git a/man/systemd.network.xml b/man/systemd.network.xml
index 1edaa0b2df8e1b90471bc7ff5db15da4e37d3d47..79c7a233d04143d5bb81ee74ca8eed569f6e2b7b 100644 (file)
--- a/man/systemd.network.xml
+++ b/man/systemd.network.xml
@@ -536,8 +536,8 @@
         </refsect1>
 
         <refsect1>
         </refsect1>
 
         <refsect1>

-                <title>[BridgePort] Section Options</title>
-                        <para>The <literal>[BridgePort]</literal> section accepts the following keys.</para>
+                <title>[Bridge] Section Options</title>
+                        <para>The <literal>[Bridge]</literal> section accepts the following keys.</para>

                         <variablelist class='network-directives'>
                                 <varlistentry>
                                         <term><varname>Cost=</varname></term>
                         <variablelist class='network-directives'>
                                 <varlistentry>
                                         <term><varname>Cost=</varname></term>

diff --git a/src/network/networkd-network-gperf.gperf b/src/network/networkd-network-gperf.gperf
index bd422e3e0b0feb0b3200ba362e122912edfdea39..640a3a20b8501486cb063195673a1b19d56afe73 100644 (file)
--- a/src/network/networkd-network-gperf.gperf
+++ b/src/network/networkd-network-gperf.gperf
@@ -61,7 +61,7 @@ DHCP.RequestBroadcast,       config_parse_bool,                  0,
 DHCP.CriticalConnection,     config_parse_bool,                  0,                             offsetof(Network, dhcp_critical)
 DHCP.VendorClassIdentifier,  config_parse_string,                0,                             offsetof(Network, dhcp_vendor_class_identifier)
 DHCP.RouteMetric,            config_parse_unsigned,              0,                             offsetof(Network, dhcp_route_metric)
 DHCP.CriticalConnection,     config_parse_bool,                  0,                             offsetof(Network, dhcp_critical)
 DHCP.VendorClassIdentifier,  config_parse_string,                0,                             offsetof(Network, dhcp_vendor_class_identifier)
 DHCP.RouteMetric,            config_parse_unsigned,              0,                             offsetof(Network, dhcp_route_metric)

-BridgePort.Cost,             config_parse_unsigned,              0,                             offsetof(Network, cost)
+Bridge.Cost,                 config_parse_unsigned,              0,                             offsetof(Network, cost)

 /* backwards compatibility: do not add new entries to this section */
 DHCPv4.UseDNS,               config_parse_bool,                  0,                             offsetof(Network, dhcp_dns)
 DHCPv4.UseMTU,               config_parse_bool,                  0,                             offsetof(Network, dhcp_mtu)
 /* backwards compatibility: do not add new entries to this section */
 DHCPv4.UseDNS,               config_parse_bool,                  0,                             offsetof(Network, dhcp_dns)
 DHCPv4.UseMTU,               config_parse_bool,                  0,                             offsetof(Network, dhcp_mtu)

diff --git a/src/network/networkd-network.c b/src/network/networkd-network.c
index 075596af6bc7f318d22cd94c753d9d2d1e058041..ef9e0a8c357459642bd68e57bf3b580efe2fb689 100644 (file)
--- a/src/network/networkd-network.c
+++ b/src/network/networkd-network.c
@@ -97,7 +97,7 @@ static int network_load_one(Manager *manager, const char *filename) {
                          "Route\0"
                          "DHCP\0"
                          "DHCPv4\0"
                          "Route\0"
                          "DHCP\0"
                          "DHCPv4\0"

-                         "BridgePort\0",
+                         "Bridge\0",

                          config_item_perf_lookup, network_network_gperf_lookup,
                          false, false, true, network);
         if (r < 0)
                          config_item_perf_lookup, network_network_gperf_lookup,
                          false, false, true, network);
         if (r < 0)