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

[tftp] Allow builds without TFTP support 

Allow TFTP to be configured out by moving the next-server setting
definition (which is used by autoboot.c) from tftp.c to settings.c.

Signed-off-by: Michael Brown <mcb30@ipxe.org>
pull/6/head
Michael Brown 2012-04-17 11:50:11 +01:00
parent 831b16adde
commit 52e5ddce68
2 changed files with 8 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

@ -1798,6 +1798,14 @@ struct setting hostname_setting __setting ( SETTING_HOST ) = {
.type = &setting_type_string, .type = &setting_type_string,
}; };
/** TFTP server setting */
struct setting next_server_setting __setting ( SETTING_BOOT ) = {
.name = "next-server",
.description = "TFTP server",
.tag = DHCP_EB_SIADDR,
.type = &setting_type_ipv4,
};
/** Filename setting */ /** Filename setting */
struct setting filename_setting __setting ( SETTING_BOOT ) = { struct setting filename_setting __setting ( SETTING_BOOT ) = {
.name = "filename", .name = "filename",

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

@ -1214,14 +1214,6 @@ struct uri_opener mtftp_uri_opener __uri_opener = {
****************************************************************************** ******************************************************************************
*/ */
/** TFTP server setting */
struct setting next_server_setting __setting ( SETTING_BOOT ) = {
.name = "next-server",
.description = "TFTP server",
.tag = DHCP_EB_SIADDR,
.type = &setting_type_ipv4,
};
/** /**
* Apply TFTP configuration settings * Apply TFTP configuration settings
* *