summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTom Gundersen <teg@jklm.no>2014-08-15 12:45:59 +0200
committerTom Gundersen <teg@jklm.no>2014-08-15 12:53:34 +0200
commitad0734e890b25751ef8229e47210ff11ae8fa3f3 (patch)
treed85096fcf1bbfe2eea0e697e9897a13198916605 /src
parent1836bf9e1d70240c8079e4db4312309f4f1f91fd (diff)
networkd: rename UseDomainName to UseDomains
This option will also apply to the search domains, so make it plural.
Diffstat (limited to 'src')
-rw-r--r--src/network/networkd-link.c2
-rw-r--r--src/network/networkd-network-gperf.gperf5
-rw-r--r--src/network/networkd.h2
3 files changed, 5 insertions, 4 deletions
diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
index 6497090bc0..9eb2e89091 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 e5e666451a..9cd7a4aa61 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 29b7c82a97..90e798dbf5 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;