Преглед на файлове

[iscsi] Include DHCP server address in iBFT

Signed-off-by: Michael Brown <mcb30@ipxe.org>
tags/v1.20.1
Michael Brown преди 8 години
родител
ревизия
97c3f6e55a
променени са 2 файла, в които са добавени 3 реда и са изтрити 0 реда
  1. 1
    0
      src/drivers/block/ibft.c
  2. 2
    0
      src/include/ipxe/settings.h

+ 1
- 0
src/drivers/block/ibft.c Целия файл

260
 	ibft_set_ipaddr_setting ( NULL, &nic->dns[0], &dns_setting,
260
 	ibft_set_ipaddr_setting ( NULL, &nic->dns[0], &dns_setting,
261
 				  ( sizeof ( nic->dns ) /
261
 				  ( sizeof ( nic->dns ) /
262
 				    sizeof ( nic->dns[0] ) ) );
262
 				    sizeof ( nic->dns[0] ) ) );
263
+	ibft_set_ipaddr_setting ( parent, &nic->dhcp, &dhcp_server_setting, 1 );
263
 	DBG ( "iBFT NIC DNS = %s", ibft_ipaddr ( &nic->dns[0] ) );
264
 	DBG ( "iBFT NIC DNS = %s", ibft_ipaddr ( &nic->dns[0] ) );
264
 	DBG ( ", %s\n", ibft_ipaddr ( &nic->dns[1] ) );
265
 	DBG ( ", %s\n", ibft_ipaddr ( &nic->dns[1] ) );
265
 	if ( ( rc = ibft_set_string_setting ( NULL, strings, &nic->hostname,
266
 	if ( ( rc = ibft_set_string_setting ( NULL, strings, &nic->hostname,

+ 2
- 0
src/include/ipxe/settings.h Целия файл

462
 asset_setting __setting ( SETTING_HOST_EXTRA, asset );
462
 asset_setting __setting ( SETTING_HOST_EXTRA, asset );
463
 extern const struct setting
463
 extern const struct setting
464
 board_serial_setting __setting ( SETTING_HOST_EXTRA, board-serial );
464
 board_serial_setting __setting ( SETTING_HOST_EXTRA, board-serial );
465
+extern const struct setting dhcp_server_setting __setting ( SETTING_MISC,
466
+							    dhcp-server );
465
 
467
 
466
 /**
468
 /**
467
  * Initialise a settings block
469
  * Initialise a settings block

Loading…
Отказ
Запис