From 97c3f6e55a941a3caf3a0a36346d2e89f5a7b283 Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Tue, 29 Mar 2016 19:38:18 +0100 Subject: [PATCH] [iscsi] Include DHCP server address in iBFT Signed-off-by: Michael Brown --- src/drivers/block/ibft.c | 1 + src/include/ipxe/settings.h | 2 ++ 2 files changed, 3 insertions(+) diff --git a/src/drivers/block/ibft.c b/src/drivers/block/ibft.c index 6aabd766..91a808d8 100644 --- a/src/drivers/block/ibft.c +++ b/src/drivers/block/ibft.c @@ -260,6 +260,7 @@ static int ibft_fill_nic ( struct ibft_nic *nic, ibft_set_ipaddr_setting ( NULL, &nic->dns[0], &dns_setting, ( sizeof ( nic->dns ) / sizeof ( nic->dns[0] ) ) ); + ibft_set_ipaddr_setting ( parent, &nic->dhcp, &dhcp_server_setting, 1 ); DBG ( "iBFT NIC DNS = %s", ibft_ipaddr ( &nic->dns[0] ) ); DBG ( ", %s\n", ibft_ipaddr ( &nic->dns[1] ) ); if ( ( rc = ibft_set_string_setting ( NULL, strings, &nic->hostname, diff --git a/src/include/ipxe/settings.h b/src/include/ipxe/settings.h index 4f56f3e9..b44794af 100644 --- a/src/include/ipxe/settings.h +++ b/src/include/ipxe/settings.h @@ -462,6 +462,8 @@ extern const struct setting asset_setting __setting ( SETTING_HOST_EXTRA, asset ); extern const struct setting board_serial_setting __setting ( SETTING_HOST_EXTRA, board-serial ); +extern const struct setting dhcp_server_setting __setting ( SETTING_MISC, + dhcp-server ); /** * Initialise a settings block