From 7c30803bec8dba0019565ab6afe5b0c234259636 Mon Sep 17 00:00:00 2001 From: RJ Trujillo Date: Sat, 23 Sep 2023 09:16:49 -0600 Subject: [PATCH] fix: Don't explicitly check main when excluding Nvidia --- system_files/desktop/shared/usr/bin/bazzite-hardware-setup | 2 +- .../desktop/shared/usr/share/ublue-os/firstboot/yafti.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/system_files/desktop/shared/usr/bin/bazzite-hardware-setup b/system_files/desktop/shared/usr/bin/bazzite-hardware-setup index d85de13f..4c20d6ce 100755 --- a/system_files/desktop/shared/usr/bin/bazzite-hardware-setup +++ b/system_files/desktop/shared/usr/bin/bazzite-hardware-setup @@ -120,7 +120,7 @@ if [[ $IMAGE_FLAVOR = "nvidia" ]]; then if [[ ! $KARGS =~ "nvidia-drm.modeset" ]]; then NEEDED_KARGS="$NEEDED_KARGS --append=nvidia-drm.modeset=1" fi -elif [[ $IMAGE_FLAVOR = "main" ]]; then +else echo "Checking for needed karg changes" if [[ $KARGS =~ "rd.driver.blacklist" ]]; then diff --git a/system_files/desktop/shared/usr/share/ublue-os/firstboot/yafti.yml b/system_files/desktop/shared/usr/share/ublue-os/firstboot/yafti.yml index 781c070c..86c14b39 100644 --- a/system_files/desktop/shared/usr/share/ublue-os/firstboot/yafti.yml +++ b/system_files/desktop/shared/usr/share/ublue-os/firstboot/yafti.yml @@ -67,7 +67,7 @@ screens: values: title: AMD Additions condition: - run: grep -q 'main' <<< $(jq -r '."image-flavor"' < /usr/share/ublue-os/image-info.json) + run: grep -qv 'nvidia' <<< $(jq -r '."image-flavor"' < /usr/share/ublue-os/image-info.json) show_terminal: true package_manager: yafti.plugin.run packages: