sysadmin/ipxe
1
0
Fork 0
mirror of https://github.com/ipxe/ipxe synced 2025-12-23 13:30:57 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge from Etherboot 5.4

Browse Source
This commit is contained in:
Michael Brown
2006-03-16 17:40:55 +00:00
parent 9c8a69b673 aeb70ec21c
commit 708bbc43bc
5 changed files with 60 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/core/main.c
View File

@@ -39,11 +39,6 @@ int url_port;
char as_main_program = 1;
#ifdef IMAGE_FREEBSD
int freebsd_howto = 0;
char freebsd_kernel_env[FREEBSD_KERNEL_ENV_SIZE];
#endif
#if 0
static inline unsigned long ask_boot(unsigned *index)
@@ -282,6 +277,16 @@ static int main_loop(int state)
if (dev->how_probe == PROBE_FAILED) {
state = -1;
}
if (state == 1) {
/* The bootp reply might have been changed, re-parse. */
decode_rfc1533(bootp_data.bootp_reply.bp_vend, 0,
#ifdef NO_DHCP_SUPPORT
BOOTP_VENDOR_LEN + MAX_BOOTP_EXTLEN,
#else
DHCP_OPT_LEN + MAX_BOOTP_EXTLEN,
#endif /* NO_DHCP_SUPPORT */
1);
}
}
}
switch(state) {