mirror/bazzite
1
0
Fork 0
mirror of https://github.com/ublue-os/bazzite.git synced 2025-02-06 00:39:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Remove rd.luks.options=discard karg & use --append-if-missing for kargs (#453)

Browse Source 
* fix: Remove rd.luks.options=discard karg

There is no need for it since it will be applied automatically with initramfs LUKS workaround.

* Use --append-if-missing instead of --append for rpm-ostree kargs
This commit is contained in:
fiftydinar 2023-10-19 17:44:46 +02:00 committed by GitHub
parent 15c4fdd3fb
commit 0ccfe46d9b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
system_files/desktop/shared/usr/bin/bazzite-hardware-setup
View File

@ -33,53 +33,53 @@ if [[ ":Jupiter:" =~ ":$SYS_ID:" ]]; then
echo "Checking for needed karg changes (Jupiter)"
if [[ ! $KARGS =~ "amd_pstate" ]]; then
NEEDED_KARGS="$NEEDED_KARGS --append=amd_pstate=active"
NEEDED_KARGS="$NEEDED_KARGS --append-if-missing=amd_pstate=active"
fi
if [[ ! $KARGS =~ "amd_iommu" ]]; then
NEEDED_KARGS="$NEEDED_KARGS --append=amd_iommu=off"
NEEDED_KARGS="$NEEDED_KARGS --append-if-missing=amd_iommu=off"
fi
if [[ ! $KARGS =~ "amdgpu.gttsize" ]]; then
if [[ "$(awk '/MemTotal/{print $(NF-1)}' /proc/meminfo)" == "31664740" ]]; then
echo "32GB RAM Steam Deck detected"
NEEDED_KARGS="$NEEDED_KARGS --append=amdgpu.gttsize=16256"
NEEDED_KARGS="$NEEDED_KARGS --append-if-missing=amdgpu.gttsize=16256"
sed -i 's/zram-size=1024/zram-size=2048/g' /etc/systemd/zram-generator.conf
else
NEEDED_KARGS="$NEEDED_KARGS --append=amdgpu.gttsize=8128"
NEEDED_KARGS="$NEEDED_KARGS --append-if-missing=amdgpu.gttsize=8128"
fi
fi
if [[ ! $KARGS =~ "spi_amd.speed_dev" ]]; then
NEEDED_KARGS="$NEEDED_KARGS --append=spi_amd.speed_dev=1"
NEEDED_KARGS="$NEEDED_KARGS --append-if-missing=spi_amd.speed_dev=1"
fi
if [[ ! $KARGS =~ "initcall_blacklist" ]]; then
NEEDED_KARGS="$NEEDED_KARGS --append=initcall_blacklist=simpledrm_platform_driver_init"
NEEDED_KARGS="$NEEDED_KARGS --append-if-missing=initcall_blacklist=simpledrm_platform_driver_init"
fi
if [[ ! $KARGS =~ "modprobe.blacklist=sp5100_tco" ]]; then
NEEDED_KARGS="$NEEDED_KARGS --append=modprobe.blacklist=sp5100_tco"
NEEDED_KARGS="$NEEDED_KARGS --append-if-missing=modprobe.blacklist=sp5100_tco"
fi
fi
if grep -qz "Kernel driver in use: radeon" <<< $GPU_ID; then
echo "Legacy AMD hardware detected, enabling CIK and SI support in AMDGPU"
if [[ ! $KARGS =~ "radeon.si_support" ]]; then
NEEDED_KARGS="$NEEDED_KARGS --append=radeon.si_support=0"
NEEDED_KARGS="$NEEDED_KARGS --append-if-missing=radeon.si_support=0"
fi
if [[ ! $KARGS =~ "radeon.cik_support" ]]; then
NEEDED_KARGS="$NEEDED_KARGS --append=radeon.cik_support=0"
NEEDED_KARGS="$NEEDED_KARGS --append-if-missing=radeon.cik_support=0"
fi
if [[ ! $KARGS =~ "amdgpu.si_support" ]]; then
NEEDED_KARGS="$NEEDED_KARGS --append=amdgpu.si_support=1"
NEEDED_KARGS="$NEEDED_KARGS --append-if-missing=amdgpu.si_support=1"
fi
if [[ ! $KARGS =~ "amdgpu.cik_support" ]]; then
NEEDED_KARGS="$NEEDED_KARGS --append=amdgpu.cik_support=1"
NEEDED_KARGS="$NEEDED_KARGS --append-if-missing=amdgpu.cik_support=1"
fi
fi
@ -87,15 +87,15 @@ if [[ $IMAGE_FLAVOR =~ "nvidia" ]]; then
echo "Checking for needed karg changes (Nvidia)"
if [[ ! $KARGS =~ "rd.driver.blacklist=nouveau" ]]; then
NEEDED_KARGS="$NEEDED_KARGS --append=rd.driver.blacklist=nouveau"
NEEDED_KARGS="$NEEDED_KARGS --append-if-missing=rd.driver.blacklist=nouveau"
fi
if [[ ! $KARGS =~ "modprobe.blacklist=nouveau" ]]; then
NEEDED_KARGS="$NEEDED_KARGS --append=modprobe.blacklist=nouveau"
NEEDED_KARGS="$NEEDED_KARGS --append-if-missing=modprobe.blacklist=nouveau"
fi
if [[ ! $KARGS =~ "nvidia-drm.modeset" ]]; then
NEEDED_KARGS="$NEEDED_KARGS --append=nvidia-drm.modeset=1"
NEEDED_KARGS="$NEEDED_KARGS --append-if-missing=nvidia-drm.modeset=1"
fi
else
echo "Checking for needed karg changes"
@ -118,10 +118,6 @@ if [[ $KARGS =~ "nomodeset" ]]; then
NEEDED_KARGS="$NEEDED_KARGS --delete-if-present=nomodeset"
fi
if [[ ! $KARGS =~ "rd.luks.options" ]]; then
NEEDED_KARGS="$NEEDED_KARGS --append=rd.luks.options=discard"
fi
if [[ $INITRAMFS =~ "disabled" ]]; then
echo "Found needed initramfs changes, applying."
plymouth display-message --text="Updating initramfs - Please wait, this may take a while" || true