diff options
| author | Michael Brown <mcb30@ipxe.org> | 2012-06-20 14:38:22 +0100 |
|---|---|---|
| committer | Michael Brown <mcb30@ipxe.org> | 2012-06-20 14:39:03 +0100 |
| commit | 7ea6764031da5a9d2d981ab25c24712603b9cac3 (patch) | |
| tree | a8128fcf31f3cf4d189300059385c6db3f86696a /src | |
| parent | 4010890a3940433927f34f71417719167ad58275 (diff) | |
| download | ipxe-7ea6764031da5a9d2d981ab25c24712603b9cac3.tar.gz | |
[settings] Move "domain" setting from dns.c to settings.c
Signed-off-by: Michael Brown <mcb30@ipxe.org>
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/settings.c | 8 | ||||
| -rw-r--r-- | src/include/ipxe/settings.h | 1 | ||||
| -rw-r--r-- | src/net/udp/dns.c | 8 |
3 files changed, 9 insertions, 8 deletions
diff --git a/src/core/settings.c b/src/core/settings.c index c84e1bc26..ba5329bb9 100644 --- a/src/core/settings.c +++ b/src/core/settings.c @@ -1838,6 +1838,14 @@ struct setting hostname_setting __setting ( SETTING_HOST ) = { .type = &setting_type_string, }; +/** Domain name setting */ +struct setting domain_setting __setting ( SETTING_IPv4_EXTRA ) = { + .name = "domain", + .description = "DNS domain", + .tag = DHCP_DOMAIN_NAME, + .type = &setting_type_string, +}; + /** TFTP server setting */ struct setting next_server_setting __setting ( SETTING_BOOT ) = { .name = "next-server", diff --git a/src/include/ipxe/settings.h b/src/include/ipxe/settings.h index d0a142fad..cd446202f 100644 --- a/src/include/ipxe/settings.h +++ b/src/include/ipxe/settings.h @@ -304,6 +304,7 @@ extern struct setting netmask_setting __setting ( SETTING_IPv4 ); extern struct setting gateway_setting __setting ( SETTING_IPv4 ); extern struct setting dns_setting __setting ( SETTING_IPv4_EXTRA ); extern struct setting hostname_setting __setting ( SETTING_HOST ); +extern struct setting domain_setting __setting ( SETTING_IPv4_EXTRA ); extern struct setting filename_setting __setting ( SETTING_BOOT ); extern struct setting root_path_setting __setting ( SETTING_SANBOOT ); extern struct setting username_setting __setting ( SETTING_AUTH ); diff --git a/src/net/udp/dns.c b/src/net/udp/dns.c index 124a0e492..6b4335d7d 100644 --- a/src/net/udp/dns.c +++ b/src/net/udp/dns.c @@ -600,14 +600,6 @@ struct setting dns_setting __setting ( SETTING_IPv4_EXTRA ) = { .type = &setting_type_ipv4, }; -/** Domain name setting */ -struct setting domain_setting __setting ( SETTING_IPv4_EXTRA ) = { - .name = "domain", - .description = "DNS domain", - .tag = DHCP_DOMAIN_NAME, - .type = &setting_type_string, -}; - /** * Apply DNS settings * |