From 7303ec8f3009d6630a994644ad9e539813badc52 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 10 Dec 2014 19:03:08 +0100 Subject: [PATCH] =?utf8?q?networkd:=20rename=20section=20[BridgePort]=20?= =?utf8?q?=E2=86=92=20[Bridge]?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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. --- man/systemd.network.xml | 4 ++-- src/network/networkd-network-gperf.gperf | 2 +- src/network/networkd-network.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/man/systemd.network.xml b/man/systemd.network.xml index 1edaa0b2d..79c7a233d 100644 --- a/man/systemd.network.xml +++ b/man/systemd.network.xml @@ -536,8 +536,8 @@ - [BridgePort] Section Options - The [BridgePort] section accepts the following keys. + [Bridge] Section Options + The [Bridge] section accepts the following keys. Cost= diff --git a/src/network/networkd-network-gperf.gperf b/src/network/networkd-network-gperf.gperf index bd422e3e0..640a3a20b 100644 --- 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) -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) diff --git a/src/network/networkd-network.c b/src/network/networkd-network.c index 075596af6..ef9e0a8c3 100644 --- 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" - "BridgePort\0", + "Bridge\0", config_item_perf_lookup, network_network_gperf_lookup, false, false, true, network); if (r < 0) -- 2.30.2