chore: Clean up bazzite-hardware-setup

This commit is contained in:
Kyle Gospodnetich 2023-10-13 18:22:18 -07:00
parent 3c60fffac5
commit 3bb59da8a2

View File

@ -92,11 +92,11 @@ fi
if [[ $IMAGE_FLAVOR =~ "nvidia" ]]; then if [[ $IMAGE_FLAVOR =~ "nvidia" ]]; then
echo "Checking for needed karg changes (Nvidia)" echo "Checking for needed karg changes (Nvidia)"
if [[ ! $KARGS =~ "rd.driver.blacklist" ]]; then if [[ ! $KARGS =~ "rd.driver.blacklist=nouveau" ]]; then
NEEDED_KARGS="$NEEDED_KARGS --append=rd.driver.blacklist=nouveau" NEEDED_KARGS="$NEEDED_KARGS --append=rd.driver.blacklist=nouveau"
fi fi
if [[ ! $KARGS =~ "modprobe.blacklist" ]]; then if [[ ! $KARGS =~ "modprobe.blacklist=nouveau" ]]; then
NEEDED_KARGS="$NEEDED_KARGS --append=modprobe.blacklist=nouveau" NEEDED_KARGS="$NEEDED_KARGS --append=modprobe.blacklist=nouveau"
fi fi
@ -106,22 +106,22 @@ if [[ $IMAGE_FLAVOR =~ "nvidia" ]]; then
else else
echo "Checking for needed karg changes" echo "Checking for needed karg changes"
if [[ $KARGS =~ "rd.driver.blacklist" ]]; then if [[ $KARGS =~ "rd.driver.blacklist=nouveau" ]]; then
NEEDED_KARGS="$NEEDED_KARGS --delete=rd.driver.blacklist=nouveau" NEEDED_KARGS="$NEEDED_KARGS --delete-if-present=rd.driver.blacklist=nouveau"
fi fi
if [[ $KARGS =~ "modprobe.blacklist" ]]; then if [[ $KARGS =~ "modprobe.blacklist=nouveau" ]]; then
NEEDED_KARGS="$NEEDED_KARGS --delete=modprobe.blacklist=nouveau" NEEDED_KARGS="$NEEDED_KARGS --delete-if-present=modprobe.blacklist=nouveau"
fi fi
if [[ $KARGS =~ "nvidia-drm.modeset" ]]; then if [[ $KARGS =~ "nvidia-drm.modeset" ]]; then
NEEDED_KARGS="$NEEDED_KARGS --delete=nvidia-drm.modeset=1" NEEDED_KARGS="$NEEDED_KARGS --delete-if-present=nvidia-drm.modeset=1"
fi fi
fi fi
if [[ $KARGS =~ "nomodeset" ]]; then if [[ $KARGS =~ "nomodeset" ]]; then
echo "Removing nomodeset" echo "Removing nomodeset"
NEEDED_KARGS="$NEEDED_KARGS --delete=nomodeset" NEEDED_KARGS="$NEEDED_KARGS --delete-if-present=nomodeset"
fi fi
if [[ ! $KARGS =~ "rd.luks.options" ]]; then if [[ ! $KARGS =~ "rd.luks.options" ]]; then