obel1x/fedora-OEMDRV
0
0
Fork 1
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

ks: detect target disk dynamically, drop hardcoded ignoredisk

Browse Source 
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 <noreply@anthropic.com>
This commit is contained in:
Daniel unbrot Pätzold
2026-05-03 14:00:38 +02:00
parent 3e78a77623
commit db61cf36cd
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ks_base_profiles/basic_pre_script.inc
+3
View File
@@ -65,6 +65,9 @@ else
echo "The Drive ${SYSDRIVE} contains a GPT." echo "The Drive ${SYSDRIVE} contains a GPT."
fi 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} OEMDRVPARTSHORT=${OEMDRVPART:5}
ALLPARTS=$(lsblk -n -l -o NAME "${SYSDRIVE}" -Q 'TYPE=="part"') ALLPARTS=$(lsblk -n -l -o NAME "${SYSDRIVE}" -Q 'TYPE=="part"')
REMPARTS=$(echo "$ALLPARTS" | grep -v "${OEMDRVPARTSHORT}") REMPARTS=$(echo "$ALLPARTS" | grep -v "${OEMDRVPARTSHORT}")
ks_base_profiles/cinnamon_fullsetup.cfg
+2 -2
View File
@@ -81,8 +81,8 @@ nss-pam-ldapd
authselect enable-feature with-fingerprint authselect enable-feature with-fingerprint
# Generated using Blivet version 3.12.1 # Disk selection written by %pre via basic_pre_script.inc
ignoredisk --only-use=sda,nvme0n1 %include /tmp/disk-include.cfg
# Partition clearing information - do NOT USE --initlabel ! # Partition clearing information - do NOT USE --initlabel !
clearpart --none clearpart --none
autopart --type=btrfs autopart --type=btrfs
ks_base_profiles/kde_fullsetup.cfg
+2 -2
View File
@@ -92,8 +92,8 @@ nss-pam-ldapd
# System authorization information # System authorization information
authselect enable-feature with-fingerprint authselect enable-feature with-fingerprint
# Generated using Blivet version 3.12.1 # Disk selection written by %pre via basic_pre_script.inc
ignoredisk --only-use=sda,nvme0n1 %include /tmp/disk-include.cfg
# Partition clearing information - do NOT USE --initlabel ! # Partition clearing information - do NOT USE --initlabel !
clearpart --none clearpart --none
autopart --type=btrfs autopart --type=btrfs