picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

networkd: rename UseDomainName to UseDomains 

This option will also apply to the search domains, so make it plural.
This commit is contained in:
Tom Gundersen 2014-08-15 12:45:59 +02:00
parent 1836bf9e1d
commit ad0734e890
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
man/systemd.network.xml
View File

@ -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>

2
src/network/networkd-link.c
View File

@ -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;

5
src/network/networkd-network-gperf.gperf
View File

@ -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)

2
src/network/networkd.h
View File

@ -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;