tags 695500 + moreinfo
block 695500 by 711799
user debian-...@lists.debian.org
usertags 695500 kfreebsd
thanks
Going from GRUB 2.00-18 to 2.00-22, I don't see "error: variable
`prefix' isn't set" any more. It would be nice to know if the problem
is still reproducible, although this is blocked by #711799
KiBi, please may I commit the attached change anyway (prompted by Colin
Watson's suggestion in [0]) for the sake of clarity?
[0]: http://bugs.debian.org/695500#117
Thanks,
Regards,
--
Steven Chamberlain
ste...@pyro.eu.org
commit da4cf9db9bc674d1c9b6d8df9d8e6f1c99914d18
Author: Steven Chamberlain <ste...@pyro.eu.org>
Date: Tue Feb 4 03:26:24 2014 +0000
Remove gPXE workaround on kfreebsd and hurd
The bug affecting gPXE was fixed already in GRUB 2.00 (as #635877)
diff --git a/debian/changelog b/debian/changelog
index 46c1a01..31a4bcc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,10 @@ debian-installer (201312xx) UNRELEASED; urgency=low
* Add MIPS Octeon images.
* Add MIPSEL Loongson 2E images.
+ [ Steven Chamberlain ]
+ * Remove gPXE workaround on kfreebsd and hurd (fixed already in
+ GRUB 2.00 as #635877)
+
-- Martin Michlmayr <t...@cyrius.com> Sat, 14 Dec 2013 10:13:09 +0000
debian-installer (20131211) unstable; urgency=low
diff --git a/build/config/hurd.cfg b/build/config/hurd.cfg
index 21091fc..c2b82fe 100644
--- a/build/config/hurd.cfg
+++ b/build/config/hurd.cfg
@@ -114,14 +114,9 @@ arch_netboot_dir:
fi
# Generate grub2pxe
- grub-mkimage -O i386-pc --prefix="(pxe)/$(NETBOOT_PATH)" \
- -o $(TEMP_NETBOOT_DIR)/core.img \
+ grub-mkimage -O i386-pc-pxe --prefix="(pxe)/$(NETBOOT_PATH)" \
+ -o $(TEMP_NETBOOT_DIR)/$(NETBOOT_PATH)/grub2pxe \
$(GRUB_MODULES) $(GRUB_MODULES_PXE)
- # workaround a gPXE bug
- sed -i -e 's/\x02\xb0\xad\x1b/\x03\xb0\xad\x1b/' $(TEMP_NETBOOT_DIR)/core.img
- cat $(GRUB_MODDIR)/pxeboot.img $(TEMP_NETBOOT_DIR)/core.img \
- > $(TEMP_NETBOOT_DIR)/$(NETBOOT_PATH)/grub2pxe
- rm $(TEMP_NETBOOT_DIR)/core.img
# This symlink is not strictly required, but it allows more usual
# dhcp server setups to work without modification.
diff --git a/build/config/kfreebsd.cfg b/build/config/kfreebsd.cfg
index 080111a..e7baf9a 100644
--- a/build/config/kfreebsd.cfg
+++ b/build/config/kfreebsd.cfg
@@ -137,14 +137,9 @@ arch_netboot_dir:
fi
# Generate grub2pxe
- grub-mkimage -O i386-pc --prefix="(pxe)/$(NETBOOT_PATH)" \
- -o $(TEMP_NETBOOT_DIR)/core.img \
+ grub-mkimage -O i386-pc-pxe --prefix="(pxe)/$(NETBOOT_PATH)" \
+ -o $(TEMP_NETBOOT_DIR)/$(NETBOOT_PATH)/grub2pxe \
$(GRUB_MODULES) $(GRUB_MODULES_PXE)
- # workaround a gPXE bug
- sed -i -e 's/\x02\xb0\xad\x1b/\x03\xb0\xad\x1b/' $(TEMP_NETBOOT_DIR)/core.img
- cat $(GRUB_MODDIR)/pxeboot.img $(TEMP_NETBOOT_DIR)/core.img \
- > $(TEMP_NETBOOT_DIR)/$(NETBOOT_PATH)/grub2pxe
- rm $(TEMP_NETBOOT_DIR)/core.img
# This symlink is not strictly required, but it allows more usual
# dhcp server setups to work without modification.
