--- 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  <address@hidden>
+
+	* 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  <address@hidden>
 
 	* 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))