---
build/config/hurd.cfg | 9 ++-------
build/config/kfreebsd.cfg | 9 ++-------
debian/changelog | 1 +
3 files changed, 5 insertions(+), 14 deletions(-)
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.
diff --git a/debian/changelog b/debian/changelog
index f4afd75..44cf7a5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -46,6 +46,7 @@ debian-installer (2013XXXX) UNRELEASED; urgency=low
[ Steven Chamberlain ]
* Drop GRUB module pxecmd, which was merged into pxe
+ * Remove gPXE workaround (fixed in grub2 as #635877)
-- Samuel Thibault <sthiba...@debian.org> Wed, 01 May 2013 14:18:04 +0200
--
1.8.3.2
--
To UNSUBSCRIBE, email to debian-bsd-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive:
http://lists.debian.org/1374529181-96367-2-git-send-email-ste...@pyro.eu.org
