From 18132ea9177f0d0d1c5143ab51074fa4da2e5180 Mon Sep 17 00:00:00 2001 From: David Marrero Date: Mon, 15 Apr 2024 10:45:01 -0400 Subject: [PATCH 1/8] fix: move custom-device-pollrates.conf (#975) --- .../{ => custom-device-pollrates}/custom-device-pollrates.conf | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename system_files/desktop/shared/usr/etc/{ => custom-device-pollrates}/custom-device-pollrates.conf (100%) diff --git a/system_files/desktop/shared/usr/etc/custom-device-pollrates.conf b/system_files/desktop/shared/usr/etc/custom-device-pollrates/custom-device-pollrates.conf similarity index 100% rename from system_files/desktop/shared/usr/etc/custom-device-pollrates.conf rename to system_files/desktop/shared/usr/etc/custom-device-pollrates/custom-device-pollrates.conf From ab2ba7a4d2c09f049b3b87a699b9f4c3b1a22984 Mon Sep 17 00:00:00 2001 From: Kyle Gospodnetich Date: Mon, 15 Apr 2024 12:04:57 -0700 Subject: [PATCH 2/8] chore: Test and do not run against root. --- system_files/deck/shared/usr/libexec/bazzite-enable-hhd | 5 +++++ system_files/desktop/shared/usr/libexec/bazzite-user-setup | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/system_files/deck/shared/usr/libexec/bazzite-enable-hhd b/system_files/deck/shared/usr/libexec/bazzite-enable-hhd index 79dbf7b470..edcf1f8f9b 100755 --- a/system_files/deck/shared/usr/libexec/bazzite-enable-hhd +++ b/system_files/deck/shared/usr/libexec/bazzite-enable-hhd @@ -1,4 +1,9 @@ #!/usr/bin/bash +if [ "$1" == "root" ]; then + echo "Do not run this for root." + exit 0 +fi + systemctl enable --now hhd@$(systemd-escape $1).service systemctl disable --now hhd@root.service diff --git a/system_files/desktop/shared/usr/libexec/bazzite-user-setup b/system_files/desktop/shared/usr/libexec/bazzite-user-setup index 84eacf22d6..0e4fd5cc82 100755 --- a/system_files/desktop/shared/usr/libexec/bazzite-user-setup +++ b/system_files/desktop/shared/usr/libexec/bazzite-user-setup @@ -1,5 +1,10 @@ #!/usr/bin/bash +if [ "$EUID" == 0 ]; then + echo "Bazzite user setup ran as root user. Exiting." + exit 0 +fi + IMAGE_INFO="/usr/share/ublue-os/image-info.json" IMAGE_NAME=$(jq -r '."image-name"' < $IMAGE_INFO) BASE_IMAGE_NAME=$(jq -r '."base-image-name"' < $IMAGE_INFO) From 66e9fdf43f6f6d33841517c30b55273ee7391ef2 Mon Sep 17 00:00:00 2001 From: Kyle Gospodnetich Date: Mon, 15 Apr 2024 12:11:25 -0700 Subject: [PATCH 3/8] chore: Harden root check --- system_files/desktop/shared/usr/libexec/bazzite-user-setup | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system_files/desktop/shared/usr/libexec/bazzite-user-setup b/system_files/desktop/shared/usr/libexec/bazzite-user-setup index 0e4fd5cc82..156d686f55 100755 --- a/system_files/desktop/shared/usr/libexec/bazzite-user-setup +++ b/system_files/desktop/shared/usr/libexec/bazzite-user-setup @@ -1,6 +1,6 @@ #!/usr/bin/bash -if [ "$EUID" == 0 ]; then +if [ "${EUID:-$(id -u)}" -eq 0 ]; then echo "Bazzite user setup ran as root user. Exiting." exit 0 fi From 2dab054f8d8ca6adfb52db952a03b0b4b9bd33d8 Mon Sep 17 00:00:00 2001 From: Kyle Gospodnetich Date: Mon, 15 Apr 2024 15:40:20 -0700 Subject: [PATCH 4/8] chore: Update discover overlay to 0.7.3 --- spec_files/discover-overlay/discover-overlay.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec_files/discover-overlay/discover-overlay.spec b/spec_files/discover-overlay/discover-overlay.spec index 034df941a5..1969ef8a3a 100644 --- a/spec_files/discover-overlay/discover-overlay.spec +++ b/spec_files/discover-overlay/discover-overlay.spec @@ -1,5 +1,5 @@ %global forgeurl https://github.com/trigg/Discover -Version: 0.7.1 +Version: 0.7.3 %forgemeta Name: discover-overlay From 0299d93322d5b6a6d51b3aef4ac0e272ff8a20fa Mon Sep 17 00:00:00 2001 From: Kyle Gospodnetich Date: Mon, 15 Apr 2024 16:48:47 -0700 Subject: [PATCH 5/8] feat: Re-add clevis by popular demand --- Containerfile | 1 + .../desktop/shared/usr/lib/dracut/dracut.conf.d/90-ublue.conf | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Containerfile b/Containerfile index 19e19fa874..d7a87b4542 100644 --- a/Containerfile +++ b/Containerfile @@ -280,6 +280,7 @@ RUN rpm-ostree override remove \ # Install new packages RUN rpm-ostree install \ + clevis-dracut \ discover-overlay \ python3-pip \ libadwaita \ diff --git a/system_files/desktop/shared/usr/lib/dracut/dracut.conf.d/90-ublue.conf b/system_files/desktop/shared/usr/lib/dracut/dracut.conf.d/90-ublue.conf index c1666eab54..18e360eee1 100644 --- a/system_files/desktop/shared/usr/lib/dracut/dracut.conf.d/90-ublue.conf +++ b/system_files/desktop/shared/usr/lib/dracut/dracut.conf.d/90-ublue.conf @@ -1 +1 @@ -add_dracutmodules+=" fido2 tpm2-tss pkcs11 pcsc " +add_dracutmodules+=" fido2 tpm2-tss pkcs11 pcsc clevis " From d7d9bc220d8da3414d63ca82ef3fce38fcf674e6 Mon Sep 17 00:00:00 2001 From: Kyle Gospodnetich Date: Mon, 15 Apr 2024 18:12:47 -0700 Subject: [PATCH 6/8] chore: Fix missing package --- Containerfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Containerfile b/Containerfile index d7a87b4542..2936b2538d 100644 --- a/Containerfile +++ b/Containerfile @@ -252,8 +252,7 @@ RUN rpm-ostree override remove \ pipewire-jack-audio-connection-kit-libs \ pipewire-libs \ pipewire-pulseaudio \ - pipewire-utils \ - xorg-x11-server-Xwayland && \ + pipewire-utils && \ rpm-ostree install \ mesa-va-drivers-freeworld \ mesa-vdpau-drivers-freeworld.x86_64 && \ From 6089640482c8ec2c85be30b279c36fbc29bfeef7 Mon Sep 17 00:00:00 2001 From: Kyle Gospodnetich Date: Mon, 15 Apr 2024 18:49:36 -0700 Subject: [PATCH 7/8] Revert "feat: Re-add clevis by popular demand" This reverts commit 0299d93322d5b6a6d51b3aef4ac0e272ff8a20fa. --- Containerfile | 1 - .../desktop/shared/usr/lib/dracut/dracut.conf.d/90-ublue.conf | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/Containerfile b/Containerfile index 2936b2538d..874e39a7bb 100644 --- a/Containerfile +++ b/Containerfile @@ -279,7 +279,6 @@ RUN rpm-ostree override remove \ # Install new packages RUN rpm-ostree install \ - clevis-dracut \ discover-overlay \ python3-pip \ libadwaita \ diff --git a/system_files/desktop/shared/usr/lib/dracut/dracut.conf.d/90-ublue.conf b/system_files/desktop/shared/usr/lib/dracut/dracut.conf.d/90-ublue.conf index 18e360eee1..c1666eab54 100644 --- a/system_files/desktop/shared/usr/lib/dracut/dracut.conf.d/90-ublue.conf +++ b/system_files/desktop/shared/usr/lib/dracut/dracut.conf.d/90-ublue.conf @@ -1 +1 @@ -add_dracutmodules+=" fido2 tpm2-tss pkcs11 pcsc clevis " +add_dracutmodules+=" fido2 tpm2-tss pkcs11 pcsc " From deed0b4cc8d3c31e1472014b74a6d7295e5564f5 Mon Sep 17 00:00:00 2001 From: Hijae Song Date: Tue, 16 Apr 2024 13:03:01 +0900 Subject: [PATCH 8/8] Resolved flipping upside down in desktop mode on AYANEO SLIDE devices (#984) --- system_files/deck/kinoite/usr/libexec/bazzite-rotation-fix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system_files/deck/kinoite/usr/libexec/bazzite-rotation-fix b/system_files/deck/kinoite/usr/libexec/bazzite-rotation-fix index b9a91ea893..2be4779fb6 100755 --- a/system_files/deck/kinoite/usr/libexec/bazzite-rotation-fix +++ b/system_files/deck/kinoite/usr/libexec/bazzite-rotation-fix @@ -36,7 +36,7 @@ if /usr/libexec/hardware/valve-hardware; then kscreen-doctor output.1.scale.1.00 2>&1 | tee -a /tmp/bazrotfix.log elif [[ ! -z "$IS_GAMEMODE" ]]; then kscreen-doctor output.1.rotation.normal 2>&1 | tee -a /tmp/bazrotfix.log -elif [[ ":83E1:Loki Max:AIR Plus:" =~ ":$SYS_ID:" ]]; then +elif [[ ":83E1:Loki Max:AIR Plus:SLIDE:" =~ ":$SYS_ID:" ]]; then kscreen-doctor output.1.rotation.left 2>&1 | tee -a /tmp/bazrotfix.log else kscreen-doctor output.1.rotation.normal 2>&1 | tee -a /tmp/bazrotfix.log