]> git.ipfire.org Git - thirdparty/ipxe.git/commitdiff
[iscsi] Include DHCP server address in iBFT
authorMichael Brown <mcb30@ipxe.org>
Tue, 29 Mar 2016 18:38:18 +0000 (19:38 +0100)
committerMichael Brown <mcb30@ipxe.org>
Tue, 29 Mar 2016 18:38:18 +0000 (19:38 +0100)
Signed-off-by: Michael Brown <mcb30@ipxe.org>
src/drivers/block/ibft.c
src/include/ipxe/settings.h

index 6aabd766af93f6a61e9501e7794d57b6267ed129..91a808d85df3004ba5916d5b4cf919cdfcd6b0c5 100644 (file)
@@ -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,
index 4f56f3e9eab043e82201cd5a274cf297b0791b02..b44794af29f1ce7c1b3132a32bd003336e63a740 100644 (file)
@@ -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