diff options
| author | Tom Gundersen <teg@jklm.no> | 2014-08-15 12:45:59 +0200 |
|---|---|---|
| committer | Tom Gundersen <teg@jklm.no> | 2014-08-15 12:53:34 +0200 |
| commit | ad0734e890b25751ef8229e47210ff11ae8fa3f3 (patch) | |
| tree | d85096fcf1bbfe2eea0e697e9897a13198916605 | |
| parent | 1836bf9e1d70240c8079e4db4312309f4f1f91fd (diff) | |
networkd: rename UseDomainName to UseDomains
This option will also apply to the search domains, so make it plural.
| -rw-r--r-- | man/systemd.network.xml | 2 | ||||
| -rw-r--r-- | src/network/networkd-link.c | 2 | ||||
| -rw-r--r-- | src/network/networkd-network-gperf.gperf | 5 | ||||
| -rw-r--r-- | src/network/networkd.h | 2 |
4 files changed, 6 insertions, 5 deletions
diff --git a/man/systemd.network.xml b/man/systemd.network.xml index f4ca72164..290aa6efe 100644 --- a/man/systemd.network.xml +++ b/man/systemd.network.xml @@ -447,7 +447,7 @@ </listitem> </varlistentry> <varlistentry> - <term><varname>UseDomainName=</varname></term> + <term><varname>UseDomains=</varname></term> <listitem> <para>When true (not the default), the domain name received from the DHCP server will be used for DNS resolution over this link.</para> diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c index 6497090bc..9eb2e8909 100644 --- a/src/network/networkd-link.c +++ b/src/network/networkd-link.c @@ -1763,7 +1763,7 @@ int link_save(Link *link) { fputs("\n", f); - if (link->network->dhcp_domainname && + if (link->network->dhcp_domains && link->dhcp_lease) { const char *domainname; diff --git a/src/network/networkd-network-gperf.gperf b/src/network/networkd-network-gperf.gperf index e5e666451..9cd7a4aa6 100644 --- a/src/network/networkd-network-gperf.gperf +++ b/src/network/networkd-network-gperf.gperf @@ -50,7 +50,7 @@ Route.Metric, config_parse_route_priority, 0, DHCP.UseDNS, config_parse_bool, 0, offsetof(Network, dhcp_dns) DHCP.UseMTU, config_parse_bool, 0, offsetof(Network, dhcp_mtu) DHCP.UseHostname, config_parse_bool, 0, offsetof(Network, dhcp_hostname) -DHCP.UseDomainName, config_parse_bool, 0, offsetof(Network, dhcp_domainname) +DHCP.UseDomains, config_parse_bool, 0, offsetof(Network, dhcp_domains) DHCP.UseRoutes, config_parse_bool, 0, offsetof(Network, dhcp_routes) DHCP.SendHostname, config_parse_bool, 0, offsetof(Network, dhcp_sendhost) DHCP.RequestBroadcast, config_parse_bool, 0, offsetof(Network, dhcp_broadcast) @@ -60,5 +60,6 @@ DHCP.VendorClassIdentifier, config_parse_string, 0, DHCPv4.UseDNS, config_parse_bool, 0, offsetof(Network, dhcp_dns) DHCPv4.UseMTU, config_parse_bool, 0, offsetof(Network, dhcp_mtu) DHCPv4.UseHostname, config_parse_bool, 0, offsetof(Network, dhcp_hostname) -DHCPv4.UseDomainName, config_parse_bool, 0, offsetof(Network, dhcp_domainname) +DHCP.UseDomainName, config_parse_bool, 0, offsetof(Network, dhcp_domains) +DHCPv4.UseDomainName, config_parse_bool, 0, offsetof(Network, dhcp_domains) DHCPv4.CriticalConnection, config_parse_bool, 0, offsetof(Network, dhcp_critical) diff --git a/src/network/networkd.h b/src/network/networkd.h index 29b7c82a9..90e798dbf 100644 --- a/src/network/networkd.h +++ b/src/network/networkd.h @@ -95,7 +95,7 @@ struct Network { bool dhcp_ntp; bool dhcp_mtu; bool dhcp_hostname; - bool dhcp_domainname; + bool dhcp_domains; bool dhcp_sendhost; bool dhcp_broadcast; bool dhcp_critical; |