diff options
| author | Lennart Poettering <lennart@poettering.net> | 2014-12-10 19:03:08 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2014-12-10 19:07:48 +0100 |
| commit | 7303ec8f3009d6630a994644ad9e539813badc52 (patch) | |
| tree | 9a6a6c2e74f293b057db7570cdf0f4fbd5c55080 | |
| parent | 96aad8d15a324d0e956a4e5653a11a67b209b41a (diff) | |
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.
| -rw-r--r-- | man/systemd.network.xml | 4 | ||||
| -rw-r--r-- | src/network/networkd-network-gperf.gperf | 2 | ||||
| -rw-r--r-- | 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 1edaa0b2df..79c7a233d0 100644 --- a/man/systemd.network.xml +++ b/man/systemd.network.xml @@ -536,8 +536,8 @@ </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> diff --git a/src/network/networkd-network-gperf.gperf b/src/network/networkd-network-gperf.gperf index bd422e3e0b..640a3a20b8 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 075596af6b..ef9e0a8c35 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) |