[settings] Move "domain" setting from dns.c to settings.c

Signed-off-by: Michael Brown <mcb30@ipxe.org>

diff --git a/src/core/settings.c b/src/core/settings.c
index c84e1bc26d76ccc207d8b2faf755fb1ea9d5d489..ba5329bb971527e33ea080dd09271f37596e0924 100644 (file)
--- 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 d0a142fad036a07611500879914ce160d4df6aae..cd446202f34ba7f16db6023d00e2bb6538c85489 100644 (file)
--- 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 124a0e49214e050291f3f39a05760307812baa85..6b4335d7dad25cfd5317ae0ed541b8848a9bdc78 100644 (file)
--- 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
  *