From fe9c2d4c999348b85558eb4e2323eecdd02d7ed6 Mon Sep 17 00:00:00 2001
From: Hardik Dodiya <hardik.dodiya@sap.com>
Date: Wed, 11 Feb 2026 16:09:03 +0100
Subject: [PATCH] Append squashfs into initrd while building UKI

---
 .../publish-gardenlinux-ironcore.yml          | 24 +++++++------------
 1 file changed, 9 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/publish-gardenlinux-ironcore.yml b/.github/workflows/publish-gardenlinux-ironcore.yml
index 975c29b..09cf472 100644
--- a/.github/workflows/publish-gardenlinux-ironcore.yml
+++ b/.github/workflows/publish-gardenlinux-ironcore.yml
@@ -101,24 +101,18 @@ jobs:
               done
             done
 
-            echo "First build (without UKI)"
-            ./bin/ironcore-image build \
-              --tag $IMAGE_NAME:$VERSION \
-              --config arch=amd64,squashfs=../binaries/amd64/root.squashfs,initramfs=../binaries/amd64/initrd,kernel=../binaries/amd64/vmlinuz \
-              --config arch=arm64,squashfs=../binaries/arm64/root.squashfs,initramfs=../binaries/arm64/initrd,kernel=../binaries/arm64/vmlinuz
-
-            echo "Inspecting squashfs digest for cmdline"
             for ARCH in amd64 arm64; do
-              REF_TAG="${VERSION}-${ARCH}"
-              DIGEST=$(./bin/ironcore-image inspect $IMAGE_NAME:$REF_TAG \
-                | jq -r '.manifest.layers[] | select(.mediaType == "application/vnd.ironcore.image.squashfs").digest')
-
-              CMDLINE="initrd=initrd gl.ovl=/:tmpfs gl.live=1 ip=any console=ttyS0,115200 console=tty0 earlyprintk=ttyS0,115200 consoleblank=0 ignition.firstboot=1 ignition.config.url=http://boot.onmetal.de:8083/ignition ignition.config.url.append.uuid=true ignition.platform.id=metal gl.url=http://boot.onmetal.de:8083/image?imageName=$IMAGE_NAME&version=${VERSION}&layerDigest=${DIGEST}"
-
-              echo "Building UKI for $ARCH with squashfs digest $DIGEST"
+              CMDLINE="initrd=initrd gl.ovl=/:tmpfs gl.live=1 ip=any console=ttyS0,115200 console=tty0 earlyprintk=ttyS0,115200 consoleblank=0 ignition.firstboot=1 ignition.config.url=http://boot.onmetal.de:8083/ignition ignition.config.url.append.uuid=true ignition.platform.id=metal"
+
+              echo "Building UKI for $ARCH"
+              (
+                cd ../binaries/$ARCH
+                cp initrd initrd-uki
+                echo root.squashfs | cpio -H newc -o | xz --check=crc32 >> initrd-uki
+              )
               ukify build \
                 --linux ../binaries/$ARCH/vmlinuz \
-                --initrd ../binaries/$ARCH/initrd \
+                --initrd ../binaries/$ARCH/initrd-uki \
                 --stub /usr/lib/systemd/boot/efi/linuxx64.efi.stub \
                 --cmdline "$CMDLINE" \
                 --output ../binaries/$ARCH/uki.img