forked from obel1x/fedora-OEMDRV
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 <noreply@anthropic.com>
This commit is contained in:
@@ -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}")
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user