narenas
/
opengnsys_ipxe
mirror of https://github.com/ipxe/ipxe.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Signed-off-by: Michael Brown <mcb30@ipxe.org>
pull/6/head
Michael Brown 2012-06-20 14:38:22 +01:00
parent 4010890a39
commit 7ea6764031
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/core/settings.c
View File

@ -1838,6 +1838,14 @@ struct setting hostname_setting __setting ( SETTING_HOST ) = {
.type = &setting_type_string, .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 */ /** TFTP server setting */
struct setting next_server_setting __setting ( SETTING_BOOT ) = { struct setting next_server_setting __setting ( SETTING_BOOT ) = {
.name = "next-server", .name = "next-server",

1
src/include/ipxe/settings.h
View File

@ -304,6 +304,7 @@ extern struct setting netmask_setting __setting ( SETTING_IPv4 );
extern struct setting gateway_setting __setting ( SETTING_IPv4 ); extern struct setting gateway_setting __setting ( SETTING_IPv4 );
extern struct setting dns_setting __setting ( SETTING_IPv4_EXTRA ); extern struct setting dns_setting __setting ( SETTING_IPv4_EXTRA );
extern struct setting hostname_setting __setting ( SETTING_HOST ); 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 filename_setting __setting ( SETTING_BOOT );
extern struct setting root_path_setting __setting ( SETTING_SANBOOT ); extern struct setting root_path_setting __setting ( SETTING_SANBOOT );
extern struct setting username_setting __setting ( SETTING_AUTH ); extern struct setting username_setting __setting ( SETTING_AUTH );

8
src/net/udp/dns.c
View File

@ -600,14 +600,6 @@ struct setting dns_setting __setting ( SETTING_IPv4_EXTRA ) = {
.type = &setting_type_ipv4, .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 * Apply DNS settings
* *