From 367e1f832afe20e4a91d380a749c4682d76d9038 Mon Sep 17 00:00:00 2001
From: Avi Deitcher <deitch@users.noreply.github.com>
Date: Wed, 14 Jan 2026 12:08:16 +0200
Subject: [PATCH] update images.yaml for raw-efi (#4198)

* update images.yaml for raw-efi

Signed-off-by: Avi Deitcher <avi@deitcher.net>

* Fix mkimage-raw-efi script

Signed-off-by: Chris Irrgang <chris.irrgang@gmx.de>
Signed-off-by: Avi Deitcher <avi@deitcher.net>

---------

Signed-off-by: Avi Deitcher <avi@deitcher.net>
Signed-off-by: Chris Irrgang <chris.irrgang@gmx.de>
Co-authored-by: Chris Irrgang <chris.irrgang@gmx.de>
---
 src/cmd/linuxkit/moby/build/images.yaml | 2 +-
 tools/mkimage-raw-efi/Dockerfile        | 2 +-
 tools/mkimage-raw-efi/make-efi          | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/cmd/linuxkit/moby/build/images.yaml b/src/cmd/linuxkit/moby/build/images.yaml
index bcedd34e7..c818f0cf6 100644
--- a/src/cmd/linuxkit/moby/build/images.yaml
+++ b/src/cmd/linuxkit/moby/build/images.yaml
@@ -3,7 +3,7 @@
  iso-efi:        linuxkit/mkimage-iso-efi:3e7cca512b6cd3bb1636697987375022070b2066
  iso-efi-initrd: linuxkit/mkimage-iso-efi-initrd:485a4f2a9bb1beb930f628527dec241b00aa36a9
  raw-bios:       linuxkit/mkimage-raw-bios:97fe53b0fcd6dfe5d3e7848c754ef35d62f3aa9d
- raw-efi:        linuxkit/mkimage-raw-efi:d58a640d87a6548674cf2ffb06e2a15bc13f59a4
+ raw-efi:        linuxkit/mkimage-raw-efi:c00e49ece2f03e47f3a8e047a2eeea7bd4228a34
  squashfs:       linuxkit/mkimage-squashfs:95b91b04fe4f4cf464e4f88596170b374345af2f
  erofs:          linuxkit/mkimage-erofs:c8457e5322987959c826ae054621fbdc6a65c0fd
  gcp:            linuxkit/mkimage-gcp:7f220881aed6336708b62afea9820e436b573cea
diff --git a/tools/mkimage-raw-efi/Dockerfile b/tools/mkimage-raw-efi/Dockerfile
index 50dd206ba..053ef36f6 100644
--- a/tools/mkimage-raw-efi/Dockerfile
+++ b/tools/mkimage-raw-efi/Dockerfile
@@ -1,4 +1,4 @@
-FROM linuxkit/systemd-boot:1e21eeea040fa7c55553e54d7d9f14d8ff75a24a AS systemd-boot
+FROM linuxkit/systemd-boot:7277832a6e3fb790d022c1c37edc4ea88c873b01 AS systemd-boot
 
 FROM linuxkit/alpine:7f3944798557de5518a56e3437d7ed982701f224 AS mirror
 RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/
diff --git a/tools/mkimage-raw-efi/make-efi b/tools/mkimage-raw-efi/make-efi
index 4188a6508..bbfda2878 100755
--- a/tools/mkimage-raw-efi/make-efi
+++ b/tools/mkimage-raw-efi/make-efi
@@ -55,7 +55,7 @@ PARTUUID=$(cat /proc/sys/kernel/random/uuid)
 
 cp $BOOTFILE_SRC $BOOTFILE_DST
 
-cat >> loader/loader.conf <<EOF
+cat >> loader.conf <<EOF
 timeout 0
 EOF
 
@@ -75,7 +75,7 @@ RESERVED_SECTORS=32
 # calculate sizes
 UKI_FILE_SIZE=$(stat -c %s "$UKI_FILE")
 EFI_FILE_SIZE=$(stat -c %s "$BOOTFILE_DST")
-SYSTEMD_BOOT_FILE_SIZE=$(stat -c %s loader/loader.conf)
+SYSTEMD_BOOT_FILE_SIZE=$(stat -c %s loader.conf)
 
 # this is the minimum size of our EFI System Partition
 ESP_DATA_SIZE=$(( $UKI_FILE_SIZE + $EFI_FILE_SIZE + $SYSTEMD_BOOT_FILE_SIZE ))
@@ -107,7 +107,7 @@ mmd -i $ESP_FILE ::/EFI/Linux
 mmd -i $ESP_FILE ::/loader
 mcopy -i $ESP_FILE $BOOTFILE_DST ::/EFI/BOOT/
 mcopy -i $ESP_FILE $UKI_FILE ::/EFI/Linux/
-mcopy -i $ESP_FILE loader/loader.conf ::/loader
+mcopy -i $ESP_FILE loader.conf ::/loader
 
 
 # now make our actual filesystem image