Re: [devel-distro] mki-copy-efiboot fixes

[Nikolai Kostrigin <nickel@basealt.ru>]

[-- Attachment #1: Type: text/plain, Size: 797 bytes --]


01.09.2020 13:26, Michael Shigorin пишет:
> On Mon, Aug 31, 2020 at 12:01:41PM +0200, Alexey Gladkov wrote:
>>>> Вот готовое задание для тестирования:
>>>> http://git.altlinux.org/tasks/256735
>>> Прошу прощения за свой косяк, недосмотрел ещё одну строчку
>>> в tools.mk:
>>> +CHROOT_COPY_E2KBOOT    ?= $(TOOLSDIR)/mki-copy-e2kboot
>>> Касается _только_ e2k.
>> Обновил задание:
>> http://git.altlinux.org/tasks/256735
> Ура, с этим всё хорошо :-)
>
> Если больше никого не ждёшь -- предлагаю пускать в сизиф.
Предлагаю поправить еще пару мест, ломающих загрузку инсталлятора в
режиме EFI для x64 и ia32.
Вариант решения тут:
http://git.altlinux.org/people/nickel/packages/?p=mkimage.git;a=shortlog;h=refs/heads/fix_EFI_installer_configs

Или см. вложение.
>
-- 
Best regards,
Nikolai Kostrigin


[-- Attachment #2: 0001-mki-copy-efiboot-chrooted-remove-extra-slash-in-boot.patch --]
[-- Type: text/x-patch, Size: 1289 bytes --]

From c7a030288956f52f2070d95a9d17d14f608704ac Mon Sep 17 00:00:00 2001
From: Nikolai Kostrigin <nickel@altlinux.org>
Date: Thu, 17 Sep 2020 14:54:14 +0300
Subject: [PATCH 1/2] mki-copy-efiboot-chrooted: remove extra slash in
 bootloader path

Path starting with double slash, like:
//EFI/BOOT/<bootloader>.efi
confuses rEFInd making further boot impossible
---
 tools/mki-copy-efiboot-chrooted | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/mki-copy-efiboot-chrooted b/tools/mki-copy-efiboot-chrooted
index 2075e8e..80b1887 100644
--- a/tools/mki-copy-efiboot-chrooted
+++ b/tools/mki-copy-efiboot-chrooted
@@ -293,7 +293,7 @@ refind_add_stage2()
 		case "$1" in
 			x64)
 				# ELILO used as SB trampoline for unsigned kernels
-				loader="/$boot/elilo.efi"
+				loader="$boot/elilo.efi"
 				# NB: -v seems critical, otherwise we hit this:
 				#     gzip_x86_64: invalid exec_header
 				options="-v -i full.cz vmlinuz `bootparams $root` $splash"
@@ -301,7 +301,7 @@ refind_add_stage2()
 			ia32)
 				# GRUB-EFI is used as SB trampoline for unsigned kernels
 				# for ia32 EFI on x86_64 platforms
-				loader="/$boot/grubia32_ldr.efi"
+				loader="$boot/grubia32_ldr.efi"
 				options=""
 				;;
 			*)
-- 
2.25.4


[-- Attachment #3: 0002-mki-copy-efiboot-chrooted-fix-label-variable-visibil.patch --]
[-- Type: text/x-patch, Size: 1738 bytes --]

From 23fd2ec24cd8a5e9d1685ffa448db55788e7b45a Mon Sep 17 00:00:00 2001
From: Nikolai Kostrigin <nickel@altlinux.org>
Date: Thu, 17 Sep 2020 15:11:10 +0300
Subject: [PATCH 2/2] mki-copy-efiboot-chrooted: fix label variable visibility
 scope

add_grub_cfg() being called from copy_refind() was broken due to
$label was not set in that scope causing "unbound variable" error

++ add_grub_cfg
++ cat
/.host/efiboot-chrooted: line 348: label: unbound variable
++ :
++ copy_kernel
---
 tools/mki-copy-efiboot-chrooted | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/tools/mki-copy-efiboot-chrooted b/tools/mki-copy-efiboot-chrooted
index 80b1887..a75a3b8 100644
--- a/tools/mki-copy-efiboot-chrooted
+++ b/tools/mki-copy-efiboot-chrooted
@@ -223,8 +223,6 @@ copy_grub()
 
 	cp $verbose -Lf /boot/grub/fonts/unicode.pf2 "$boot/fonts"
 	cp $verbose -Lf /boot/grub/unifont.pf2 "$boot"
-
-	# add_grub_cfg
 }
 
 refind_add_stage_submenu()
@@ -263,7 +261,7 @@ refind_add_stage_submenu()
 
 refind_add_stage2()
 {
-	local root icon splash label loader options
+	local root icon splash loader options
 
 	for root in $stage2; do
 		case "$root" in
@@ -369,7 +367,7 @@ refind_cfg_add_autodetect() {
 
 copy_refind()
 {
-	local refind_aux refind_boot refind_bootia32 refind_icons icon_format scan_icon
+	local label refind_aux refind_boot refind_bootia32 refind_icons icon_format scan_icon
 
 	refind_aux="$efi/refind"
 	refind_boot="$refind_aux/refind_x64.efi"
@@ -459,7 +457,7 @@ copy_refind()
 		REFIND_EOF
 	} > "$boot/refind_ia32.conf"
 
-	add_grub_cfg || :
+	add_grub_cfg
 }
 
 #find out if all bootloader stages have ia32 binaries in the package
-- 
2.25.4