Browse Source

[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 years ago
parent
commit
7ea6764031
3 changed files with 9 additions and 8 deletions
  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 View File

1838
 	.type = &setting_type_string,
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
 /** TFTP server setting */
1849
 /** TFTP server setting */
1842
 struct setting next_server_setting __setting ( SETTING_BOOT ) = {
1850
 struct setting next_server_setting __setting ( SETTING_BOOT ) = {
1843
 	.name = "next-server",
1851
 	.name = "next-server",

+ 1
- 0
src/include/ipxe/settings.h View File

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

+ 0
- 8
src/net/udp/dns.c View File

600
 	.type = &setting_type_ipv4,
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
  * Apply DNS settings
604
  * Apply DNS settings
613
  *
605
  *

Loading…
Cancel
Save