2021-06-27 21:14:12 +03:00
|
|
|
From 11de1563f4cf3f84c94c0bba75217aa94d4f3018 Mon Sep 17 00:00:00 2001
|
2021-06-27 17:50:54 +03:00
|
|
|
From: Mikhail Novosyolov <m.novosyolov@rosalinux.ru>
|
|
|
|
|
Date: Sun, 27 Jun 2021 16:42:50 +0300
|
2021-06-27 21:14:12 +03:00
|
|
|
Subject: [PATCH 09/12] Fix check if EFI bootloader exists
|
2021-06-27 17:50:54 +03:00
|
|
|
|
|
|
|
|
A path of initial location before copying files to the isodir was checked.
|
|
|
|
|
Let's better check the real location which will be fed to mkefiboot bellow.
|
|
|
|
|
---
|
|
|
|
|
imgcreate/live.py | 4 ++--
|
|
|
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
|
|
|
|
|
|
diff --git a/imgcreate/live.py b/imgcreate/live.py
|
|
|
|
|
index 707dd39..233c9ff 100644
|
|
|
|
|
--- a/imgcreate/live.py
|
|
|
|
|
+++ b/imgcreate/live.py
|
|
|
|
|
@@ -232,8 +232,8 @@ class LiveImageCreatorBase(LoopImageCreator):
|
|
|
|
|
|
|
|
|
|
def _generate_efiboot(self, isodir):
|
|
|
|
|
"""Generate EFI boot images."""
|
|
|
|
|
- if not glob.glob(self._instroot+"/boot/efi/EFI/*/shim*.efi"):
|
|
|
|
|
- logging.error("Missing shim.efi, skipping efiboot.img creation.")
|
|
|
|
|
+ if not glob.glob(isodir + "/EFI/BOOT/BOOT*.EFI"):
|
|
|
|
|
+ logging.error("Missing initial EFI bootloader, skipping efiboot.img creation.")
|
|
|
|
|
return
|
|
|
|
|
|
|
|
|
|
# XXX-BCL: does this need --label?
|
|
|
|
|
--
|
|
|
|
|
2.31.1
|
|
|
|
|
|
