test-efi-create-disk: support /boot/efi

Most of our tools allow EFI mount to be on /boot/efi. Do the same here.

diff --git a/test/test-efi-create-disk.sh b/test/test-efi-create-disk.sh
index b7a2bf5b9dce15b987680b4fe1274ea1535f41ff..e0949ba7295c7b9333f56edfc99ad0ca7bd43a1e 100755 (executable)
--- 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