From 64fdbed1108897bdc9089d4f683bf148b088441f Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Thu, 7 Jun 2018 22:17:05 +0100 Subject: [PATCH] flash-image: Remove any other GRUB configuration files in EFI mode Signed-off-by: Michael Tremer --- lfs/flash-images | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/lfs/flash-images b/lfs/flash-images index 014255389e..62b60b156c 100644 --- a/lfs/flash-images +++ b/lfs/flash-images @@ -73,11 +73,8 @@ else PART_TYPE = L endif -GRUB_CFGS = /boot/grub/grub.cfg - ifeq "$(EFI)" "1" S_EFI = 204800 - GRUB_CFGS += /boot/efi/EFI/ipfire/grub-efi/grub.cfg else S_EFI = 0 endif @@ -206,14 +203,11 @@ ifeq "$(BOOTLOADER)" "grub" $(MNThdd)/etc/grub.d/ # Create configuration - for i in $(GRUB_CFGS); do \ - mkdir -pv $$(dirname $(MNThdd)$(GRUB_CFG)); \ - chroot $(MNThdd) grub-mkconfig -o $$i || exit 1; \ - done + mkdir -pv $(MNThdd)/boot/grub + chroot $(MNThdd) grub-mkconfig -o /boot/grub/grub.cfg # Insert the UUID because grub-mkconfig often fails to # detect that correctly - sed -i $(addprefix $(MNThdd),$(GRUB_CFGS)) \ sed -i $(MNThdd)/boot/grub/grub.cfg \ -e "s/root=[A-Za-z0-9\/=-]*/root=UUID=$$(blkid -o value -s UUID $(PART_ROOT))/g" -- 2.39.5