From 59f4cc964263e095b9e4e4fde46e4ec2e000969b Mon Sep 17 00:00:00 2001 From: Martin Whitaker Date: Sat, 29 Feb 2020 23:34:41 +0000 Subject: bootloader: in grub 2.04 linux16/linuxefi are included in linux module. --- NEWS | 1 + bootloader/Makefile | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/NEWS b/NEWS index db02365..49d7f3a 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,4 @@ +- bootloader: in grub 2.04 linux16/linuxefi are included in linux module - update examples to default to Mageia 8 - update examples to support encrypted persistent partition diff --git a/bootloader/Makefile b/bootloader/Makefile index 7ec8ac8..b0693dd 100644 --- a/bootloader/Makefile +++ b/bootloader/Makefile @@ -28,15 +28,15 @@ 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) linux16 + grub2-mkimage --output $@ --prefix /boot/grub2 --format i386-pc-eltorito biosdisk $(GRUB2_MODULES) images/bootia32.efi: @mkdir -p images - grub2-mkimage --output $@ --prefix /EFI/BOOT --format i386-efi $(GRUB2_MODULES) linuxefi + grub2-mkimage --output $@ --prefix /EFI/BOOT --format i386-efi $(GRUB2_MODULES) images/bootx64.efi: @mkdir -p images - grub2-mkimage --output $@ --prefix /EFI/BOOT --format x86_64-efi $(GRUB2_MODULES) linuxefi + grub2-mkimage --output $@ --prefix /EFI/BOOT --format x86_64-efi $(GRUB2_MODULES) kbd-names%txt lang-kbds%txt: ./make-kbd-info -- cgit v1.2.1