summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Whitaker <mageia@martin-whitaker.me.uk>2019-01-12 19:29:54 +0000
committerMartin Whitaker <mageia@martin-whitaker.me.uk>2019-01-12 19:51:53 +0000
commit4bcc6dda65ccf642ea8d01c295f61fb3e98b9671 (patch)
tree4dbfa817e67083f6e32313104b98e75aa7e6ad12
parent424456c8ce9d78d942a64e6861fb56a79c7305c1 (diff)
downloaddrakiso-4bcc6dda65ccf642ea8d01c295f61fb3e98b9671.tar
drakiso-4bcc6dda65ccf642ea8d01c295f61fb3e98b9671.tar.gz
drakiso-4bcc6dda65ccf642ea8d01c295f61fb3e98b9671.tar.bz2
drakiso-4bcc6dda65ccf642ea8d01c295f61fb3e98b9671.tar.xz
drakiso-4bcc6dda65ccf642ea8d01c295f61fb3e98b9671.zip
Fix linux16/linuxefi inclusion in bootloader images.
-rw-r--r--NEWS2
-rw-r--r--bootloader/Makefile4
2 files changed, 4 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index 6a8ecc1..66f79b4 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,5 @@
+- fix linux16/linuxefi inclusion in bootloader images
+
1.7:
- default to using linux16 and linuxefi GRUB2 commands (mga#24137)
diff --git a/bootloader/Makefile b/bootloader/Makefile
index 188be0b..7ec8ac8 100644
--- a/bootloader/Makefile
+++ b/bootloader/Makefile
@@ -28,11 +28,11 @@ images/boot_hybrid.img: /usr/lib/grub/i386-pc/boot_hybrid.img
images/eltorito.img:
@mkdir -p images
- grub2-mkimage --output $@ --prefix /boot/grub2 --format i386-pc-eltorito biosdisk $(GRUB2_MODULES)
+ grub2-mkimage --output $@ --prefix /boot/grub2 --format i386-pc-eltorito biosdisk $(GRUB2_MODULES) linux16
images/bootia32.efi:
@mkdir -p images
- grub2-mkimage --output $@ --prefix /EFI/BOOT --format i386-efi $(GRUB2_MODULES) linux16
+ grub2-mkimage --output $@ --prefix /EFI/BOOT --format i386-efi $(GRUB2_MODULES) linuxefi
images/bootx64.efi:
@mkdir -p images