From a776fe5f94c6b673498addecf2e8835de286d424 Mon Sep 17 00:00:00 2001
From: Saya Andy <saya.andy@posteo.com>
Date: Mon, 3 Aug 2026 21:15:01 +0700
Subject: feat: kiwi descriptions adaptation for surface pro 12"

---
 components/liveinstall.xml | 38 ++++++--------------------------------
 1 file changed, 6 insertions(+), 32 deletions(-)

(limited to 'components/liveinstall.xml')

diff --git a/components/liveinstall.xml b/components/liveinstall.xml
index c324769..55ae4eb 100644
--- a/components/liveinstall.xml
+++ b/components/liveinstall.xml
@@ -5,46 +5,17 @@
 			<requires profile="BootCoreLive"/>
 		</profile>
 	</profiles>
-	<preferences profiles="LiveInstall" arch="x86_64">
-		<type image="iso"
-			publisher="Fedora Project" volid="Fedora_Linux" application_id="Fedora_Linux"
-			primary="true" flags="dmsquash" filesystem="erofs" erofscompression="lzma,level=6" mediacheck="true"
-			firmware="uefi" efiparttable="gpt" efifatimagesize="30" kernelcmdline="quiet rhgb"
-			fscreateoptions="-Efragments -C 1048576"
-			>
-			<bootloader name="grub2" grub_template="grub-x86.cfg.iso-template" console="console" timeout="10"/>
-		</type>
-	</preferences>
 	<preferences profiles="LiveInstall" arch="aarch64">
 		<type image="iso"
 			publisher="Fedora Project" volid="Fedora_Linux" application_id="Fedora_Linux"
 			primary="true" flags="dmsquash" filesystem="erofs" erofscompression="lzma,level=6" mediacheck="true"
-			firmware="uefi" efiparttable="gpt" efifatimagesize="30" kernelcmdline="quiet rhgb"
+			firmware="efi" efiparttable="gpt" efifatimagesize="30"
+			kernelcmdline="quiet rhgb clk_ignore_unused pd_ignore_unused systemd.tpm2_wait=0 rd.live.ram=1"
 			fscreateoptions="-Efragments -C 1048576"
 			>
 			<bootloader name="grub2" grub_template="grub-arm.cfg.iso-template" console="console" timeout="10"/>
 		</type>
 	</preferences>
-	<preferences profiles="LiveInstall" arch="riscv64">
-		<type image="iso"
-			publisher="Fedora Project" volid="Fedora_Linux" application_id="Fedora_Linux"
-			primary="true" flags="dmsquash" filesystem="erofs" erofscompression="lzma,level=6" mediacheck="true"
-			firmware="uefi" efiparttable="gpt" efifatimagesize="30" kernelcmdline="quiet rhgb"
-			fscreateoptions="-Efragments -C 1048576"
-			>
-			<bootloader name="grub2" grub_template="grub-riscv64.cfg.iso-template" console="console" timeout="10"/>
-		</type>
-	</preferences>
-	<preferences profiles="LiveInstall" arch="ppc64le">
-		<type image="iso"
-			publisher="Fedora Project" volid="Fedora_Linux" application_id="Fedora_Linux"
-			primary="true" flags="dmsquash" filesystem="erofs" erofscompression="lzma,level=6" mediacheck="true"
-			firmware="ofw" kernelcmdline="quiet rhgb"
-			fscreateoptions="-Efragments -C 1048576"
-			>
-			<bootloader name="grub2" grub_template="grub-ppc.cfg.iso-template" console="console" timeout="10"/>
-		</type>
-	</preferences>
 	<packages type="iso" patternType="plusRecommended" profiles="LiveInstall">
 		<!-- Filter out unwanted EFI files from the embedded ESP, see rhbz#2358785 -->
 		<file name="iso-esp-excludes.yaml" target="image/exclude_files_efifatimage.yaml"/>
@@ -57,7 +28,10 @@
 		<package name="dracut-live"/>
 		<package name="glibc-all-langpacks"/>
 		<package name="isomd5sum"/>
-		<package name="kernel"/>
+		<!-- Surface Pro 12": no plain "kernel" package here, it hard-Requires
+		     kernel-uki-dtbloader on aarch64, which conflicts with BootCoreLive's
+		     kernel-core. grub2's ISO kernel lookup just needs a vmlinuz in /boot,
+		     which kernel-core (already installed there) already provides. -->
 		<package name="kernel-modules"/>
 		<package name="kernel-modules-extra"/>
 		<package name="livesys-scripts"/>
-- 
cgit v1.3.1+13