From 031e7e3241d6339f4e6154c445ac24dd090483fb Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Mon, 10 May 2021 20:35:31 +0200 Subject: [PATCH] test-efi-create-disk: support /boot/efi Most of our tools allow EFI mount to be on /boot/efi. Do the same here. --- test/test-efi-create-disk.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/test/test-efi-create-disk.sh b/test/test-efi-create-disk.sh index b7a2bf5b9dc..e0949ba7295 100755 --- a/test/test-efi-create-disk.sh +++ b/test/test-efi-create-disk.sh @@ -6,6 +6,9 @@ systemd_efi="${2:?}" boot_stub="${3:?}" splash_bmp="${4:?}" +efi_dir="$(bootctl -p)" +entry_dir="${efi_dir}/$(cat /etc/machine-id)/$(uname -r)" + # create GPT table with EFI System Partition rm -f "$out" dd if=/dev/null of="$out" bs=1M seek=512 count=1 status=none @@ -30,8 +33,8 @@ objcopy \ --add-section .osrel=/etc/os-release --change-section-vma .osrel=0x20000 \ --add-section .cmdline=mnt/cmdline.txt --change-section-vma .cmdline=0x30000 \ --add-section .splash="$splash_bmp" --change-section-vma .splash=0x40000 \ - --add-section .linux="/boot/$(cat /etc/machine-id)/$(uname -r)/linux" --change-section-vma .linux=0x2000000 \ - --add-section .initrd="/boot/$(cat /etc/machine-id)/$(uname -r)/initrd" --change-section-vma .initrd=0x3000000 \ + --add-section .linux="${entry_dir}/linux" --change-section-vma .linux=0x2000000 \ + --add-section .initrd="${entry_dir}/initrd" --change-section-vma .initrd=0x3000000 \ "$boot_stub" mnt/EFI/Linux/linux-test.efi # install entries -- 2.47.3