From: Steven Chamberlain <ste...@pyro.eu.org>

---
 build/config/hurd.cfg     | 9 ++-------
 build/config/kfreebsd.cfg | 9 ++-------
 2 files changed, 4 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.
-- 
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/1374526642-95217-2-git-send-email-ste...@pyro.eu.org

Reply via email to