X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=test%2Ftest-efi-create-disk.sh;h=56dd09abd73f82f6a6c182e70f9e0c5fac899864;hb=851c9f82736c89d423b244a292e153ec7124d309;hp=07595b7214857e14821defd68494c88d1de962f4;hpb=0fa2cac4f0cdefaf1addd7f1fe0fd8113db9360b;p=elogind.git

diff --git a/test/test-efi-create-disk.sh b/test/test-efi-create-disk.sh
index 07595b721..56dd09abd 100755
--- a/test/test-efi-create-disk.sh
+++ b/test/test-efi-create-disk.sh
@@ -12,8 +12,7 @@ mkdir -p mnt
 mount ${LOOP}p1 mnt
 
 mkdir -p mnt/EFI/{Boot,systemd}
-cp sd-bootx64.efi mnt/EFI/Boot/bootx64.efi
-cp test/splash.bmp mnt/EFI/systemd/
+cp systemd-bootx64.efi mnt/EFI/Boot/bootx64.efi
 
 [ -e /boot/shellx64.efi ] && cp /boot/shellx64.efi mnt/
 
@@ -22,13 +21,14 @@ echo -n "foo=yes bar=no root=/dev/fakeroot debug rd.break=initqueue" > mnt/cmdli
 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 .linux=/boot/$(cat /etc/machine-id)/$(uname -r)/linux --change-section-vma .linux=0x40000 \
+  --add-section .splash=test/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 \
   linuxx64.efi.stub mnt/EFI/Linux/linux-test.efi
 
 # install entries
 mkdir -p mnt/loader/entries
-echo -e "timeout 3\nsplash /EFI/systemd/splash.bmp\n" > mnt/loader/loader.conf
+echo -e "timeout 3\n" > mnt/loader/loader.conf
 echo -e "title Test\nefi /test\n" > mnt/loader/entries/test.conf
 echo -e "title Test2\nlinux /test2\noptions option=yes word number=1000 more\n" > mnt/loader/entries/test2.conf
 echo -e "title Test3\nlinux /test3\n" > mnt/loader/entries/test3.conf