From db61cf36cd50905b058208763250f0f3d01e2cfd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20unbrot=20P=C3=A4tzold?= Date: Sun, 3 May 2026 14:00:38 +0200 Subject: [PATCH] ks: detect target disk dynamically, drop hardcoded ignoredisk basic_pre_script.inc already identifies the disk holding OEMDRV ($SYSDRIVE). Write its short name to /tmp/disk-include.cfg after the GPT check so both cinnamon and KDE profiles can %include it instead of the hardcoded 'ignoredisk --only-use=sda,nvme0n1' that fails on systems without an NVMe drive (or without sda). Co-Authored-By: Claude Sonnet 4.6 --- ks_base_profiles/basic_pre_script.inc | 3 +++ ks_base_profiles/cinnamon_fullsetup.cfg | 4 ++-- ks_base_profiles/kde_fullsetup.cfg | 4 ++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ks_base_profiles/basic_pre_script.inc b/ks_base_profiles/basic_pre_script.inc index 3f0deff..b3fbdb9 100644 --- a/ks_base_profiles/basic_pre_script.inc +++ b/ks_base_profiles/basic_pre_script.inc @@ -65,6 +65,9 @@ else echo "The Drive ${SYSDRIVE} contains a GPT." fi +# Write the target disk for %include in the kickstart main section +echo "ignoredisk --only-use=${SYSDRIVE:5}" > /tmp/disk-include.cfg + OEMDRVPARTSHORT=${OEMDRVPART:5} ALLPARTS=$(lsblk -n -l -o NAME "${SYSDRIVE}" -Q 'TYPE=="part"') REMPARTS=$(echo "$ALLPARTS" | grep -v "${OEMDRVPARTSHORT}") diff --git a/ks_base_profiles/cinnamon_fullsetup.cfg b/ks_base_profiles/cinnamon_fullsetup.cfg index c8a2743..e1fd04b 100644 --- a/ks_base_profiles/cinnamon_fullsetup.cfg +++ b/ks_base_profiles/cinnamon_fullsetup.cfg @@ -81,8 +81,8 @@ nss-pam-ldapd authselect enable-feature with-fingerprint -# Generated using Blivet version 3.12.1 -ignoredisk --only-use=sda,nvme0n1 +# Disk selection written by %pre via basic_pre_script.inc +%include /tmp/disk-include.cfg # Partition clearing information - do NOT USE --initlabel ! clearpart --none autopart --type=btrfs diff --git a/ks_base_profiles/kde_fullsetup.cfg b/ks_base_profiles/kde_fullsetup.cfg index 235b498..cab7c62 100644 --- a/ks_base_profiles/kde_fullsetup.cfg +++ b/ks_base_profiles/kde_fullsetup.cfg @@ -92,8 +92,8 @@ nss-pam-ldapd # System authorization information authselect enable-feature with-fingerprint -# Generated using Blivet version 3.12.1 -ignoredisk --only-use=sda,nvme0n1 +# Disk selection written by %pre via basic_pre_script.inc +%include /tmp/disk-include.cfg # Partition clearing information - do NOT USE --initlabel ! clearpart --none autopart --type=btrfs