From 3e6cd79f81d91f0368c83ed869bc41165feb8f4e Mon Sep 17 00:00:00 2001
From: veilor-org <admin@veilor.org>
Date: Thu, 30 Apr 2026 16:38:49 +0100
Subject: [PATCH] =?UTF-8?q?ci:=20switch=20livemedia-creator=20=E2=86=92=20?=
 =?UTF-8?q?livecd-creator=20(purpose-built=20for=20live=20ISOs,=20handles?=
 =?UTF-8?q?=20EFI/BOOT)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/build-iso.yml | 43 +++++++++++++++++++--------------
 1 file changed, 25 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/build-iso.yml b/.github/workflows/build-iso.yml
index ffc260a..a75630a 100644
--- a/.github/workflows/build-iso.yml
+++ b/.github/workflows/build-iso.yml
@@ -68,31 +68,38 @@ jobs:
             cd /work
 
             # CI uses ks-ci.ks (no local fix-repo line). Generated from main ks.
-            sed '/veilor-fix/d' kickstart/veilor-os.ks > kickstart/veilor-os-ci.ks
+            # Also strip flags livecd-creator doesn't recognize.
+            sed -e '/veilor-fix/d' \
+                -e '/^shutdown$/d' \
+                kickstart/veilor-os.ks > kickstart/veilor-os-ci.ks
 
-            # Validate
             ksvalidator kickstart/veilor-os-ci.ks
+            mkdir -p build/out
 
-            # Pre-create tmp dir (lorax requires it pre-existing)
-            mkdir -p build/out /tmp/veilor-lmc
-
-            livemedia-creator \
-              --make-iso \
-              --no-virt \
-              --ks kickstart/veilor-os-ci.ks \
-              --resultdir build/out/build \
-              --project veilor-os \
+            # livecd-creator (livecd-tools) — purpose-built for live ISOs.
+            # Handles EFI/BOOT + isohybrid + grafting that livemedia-creator
+            # --make-iso --no-virt does not. Produces UEFI+BIOS bootable ISO.
+            livecd-creator \
+              --verbose \
+              --config kickstart/veilor-os-ci.ks \
+              --fslabel "veilor-os-43" \
+              --title "veilor-os" \
+              --product "veilor-os" \
               --releasever "${{ github.event.inputs.releasever || '43' }}" \
-              --volid VEILOR_OS \
-              --tmp /tmp/veilor-lmc \
-              --logfile build/out/build.log
+              --tmpdir /tmp \
+              --cache /tmp/veilor-cache 2>&1 | tee build/out/build.log
 
-            # Move output ISO + checksum
+            # Move output ISO to expected dir
+            mv ./veilor-os-43.iso build/out/ 2>/dev/null || mv ./*.iso build/out/ 2>/dev/null || true
+
+            # Rename + checksum
             ISO_NAME="veilor-os-${{ github.event.inputs.releasever || '43' }}-$(date +%Y%m%d-%H%M%S).iso"
-            mv build/out/build/*.iso "build/out/${ISO_NAME}"
             cd build/out
-            sha256sum "${ISO_NAME}" > "${ISO_NAME}.sha256"
-            ls -lh "${ISO_NAME}"
+            for f in *.iso; do
+              [[ -f $f && $f != $ISO_NAME ]] && mv "$f" "$ISO_NAME"
+            done
+            sha256sum "$ISO_NAME" > "$ISO_NAME.sha256"
+            ls -lh "$ISO_NAME"
 
       - name: Upload ISO artifact
         if: success()