浏览代码

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

Signed-off-by: Michael Brown <mcb30@ipxe.org>
tags/v1.20.1
Michael Brown 12 年前
父节点
当前提交
7ea6764031
共有 3 个文件被更改,包括 9 次插入8 次删除
  1. 8
    0
      src/core/settings.c
  2. 1
    0
      src/include/ipxe/settings.h
  3. 0
    8
      src/net/udp/dns.c

+ 8
- 0
src/core/settings.c 查看文件

@@ -1838,6 +1838,14 @@ struct setting hostname_setting __setting ( SETTING_HOST ) = {
1838 1838
 	.type = &setting_type_string,
1839 1839
 };
1840 1840
 
1841
+/** Domain name setting */
1842
+struct setting domain_setting __setting ( SETTING_IPv4_EXTRA ) = {
1843
+	.name = "domain",
1844
+	.description = "DNS domain",
1845
+	.tag = DHCP_DOMAIN_NAME,
1846
+	.type = &setting_type_string,
1847
+};
1848
+
1841 1849
 /** TFTP server setting */
1842 1850
 struct setting next_server_setting __setting ( SETTING_BOOT ) = {
1843 1851
 	.name = "next-server",

+ 1
- 0
src/include/ipxe/settings.h 查看文件

@@ -304,6 +304,7 @@ extern struct setting netmask_setting __setting ( SETTING_IPv4 );
304 304
 extern struct setting gateway_setting __setting ( SETTING_IPv4 );
305 305
 extern struct setting dns_setting __setting ( SETTING_IPv4_EXTRA );
306 306
 extern struct setting hostname_setting __setting ( SETTING_HOST );
307
+extern struct setting domain_setting __setting ( SETTING_IPv4_EXTRA );
307 308
 extern struct setting filename_setting __setting ( SETTING_BOOT );
308 309
 extern struct setting root_path_setting __setting ( SETTING_SANBOOT );
309 310
 extern struct setting username_setting __setting ( SETTING_AUTH );

+ 0
- 8
src/net/udp/dns.c 查看文件

@@ -600,14 +600,6 @@ struct setting dns_setting __setting ( SETTING_IPv4_EXTRA ) = {
600 600
 	.type = &setting_type_ipv4,
601 601
 };
602 602
 
603
-/** Domain name setting */
604
-struct setting domain_setting __setting ( SETTING_IPv4_EXTRA ) = {
605
-	.name = "domain",
606
-	.description = "DNS domain",
607
-	.tag = DHCP_DOMAIN_NAME,
608
-	.type = &setting_type_string,
609
-};
610
-
611 603
 /**
612 604
  * Apply DNS settings
613 605
  *

正在加载...
取消
保存