This is a fix that allows grub to be used in a non-DHCP environment with such that the vendor options (T150 etc) work properly. The fix is obvious when you compare the equivalent DHCP code.
Damian -- Damian Ivereigh CEPS Team Lead Desk: +61 2 8446 6344 Mob: +61 418 217 582 Please avoid sending me Word or PowerPoint attachments. See http://www.fsf.org/philosophy/no-word-attachments.html PGP Key: http://pgp.mit.edu:11371/pks/lookup?op=get&search=0x24E7A68F
--- grub/ChangeLog.orig 2004-05-20 14:07:28.524400136 +1000 +++ grub/ChangeLog 2004-05-20 14:09:28.179209840 +1000 @@ -1,3 +1,9 @@ +2004-05-20 Damian Ivereigh <[EMAIL PROTECTED]> + + * netboot/main.c: Fixed bootp only code so that options + work properly. This fix is obvious when compared with the + DHCP code. + 2004-05-17 Pavel Roskin <[EMAIL PROTECTED]> * stage2/char_io.c (safe_parse_maxint): Disable for stage 1.5. --- grub/netboot/main.c.orig 2004-05-20 14:03:59.662152024 +1000 +++ grub/netboot/main.c 2004-05-20 14:07:05.569889752 +1000 @@ -881,7 +881,8 @@ + sizeof (struct udphdr))]; if (type == AWAIT_BOOTP #ifdef NO_DHCP_SUPPORT - && (nic.packetlen >= (ETH_HLEN + sizeof (struct bootp_t))) + && (nic.packetlen + >= (ETH_HLEN + sizeof (struct bootp_t) - BOOTP_VENDOR_LEN)) #else && (nic.packetlen >= (ETH_HLEN + sizeof (struct bootp_t) - DHCP_OPT_LEN))
_______________________________________________ Bug-grub mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/bug-grub
