Merge branch 'main' into testing

.github/workflows/build_iso.yml

@@ -111,7 +111,7 @@ jobs:
           docker rmi ${image}
 
       - name: Build ISOs
-        uses: jasonn3/build-container-installer@v1.2.0
+        uses: jasonn3/build-container-installer@v1.2.1
         id: build
         with:
           arch: x86_64

system_files/desktop/shared/usr/lib/systemd/system/sunshine-workaround.service

@@ -10,7 +10,7 @@ ExecStartPre=/usr/bin/bash -c "[ -x /usr/local/bin/.sunshine ] || /usr/bin/cp /u
 # This is faster than using .mount unit. Also allows for the previous line/cleanup
 ExecStartPre=/usr/bin/bash -c "/usr/bin/mount --bind /usr/local/bin/.sunshine /usr/bin/sunshine"
 # Fix caps
-ExecStart=/usr/sbin/setcap 'cap_sys_admin+p' /usr/bin/sunshine
+ExecStart=/usr/bin/bash -c "/usr/sbin/setcap 'cap_sys_admin+p' $(/usr/bin/readlink -f $(/usr/bin/which sunshine))"
 # Clean-up after ourselves
 ExecStop=/usr/bin/umount /usr/bin/sunshine
 ExecStop=/usr/bin/rm /usr/local/bin/.sunshine

system_files/desktop/shared/usr/libexec/bazzite-hardware-setup

@@ -106,6 +106,17 @@ elif [[ ":WIN2:" =~ ":$SYS_ID:" ]]; then
   fi
 fi
 
+if [[ ":ONEXPLAYER F1:" =~ ":$SYS_ID:" ]]; then
+  if [[ ! $KARGS =~ "video" ]]; then
+    echo "Adding panel orientation for ONEXPLAYER F1"
+    NEEDED_KARGS+=("--append-if-missing=video=eDP-1:panel_orientation=left_side_up")
+  fi
+  if [[ ! $KARGS =~ "amdgpu.gttsize" ]]; then
+    echo "Adding GTTSize for ONEXPLAYER F1 (32GB RAM)"
+    NEEDED_KARGS+=("--append-if-missing=amdgpu.gttsize=16256")
+  fi
+fi
+
 if /usr/libexec/hwsupport/simpledeckytdp-supported-hardware; then
   if [[ ! $KARGS =~ "iomem" ]]; then
     echo "Adding needed kargs for ryzenadj"

system_files/desktop/shared/usr/libexec/containerbuild/image-info

@@ -31,3 +31,5 @@ cat > $IMAGE_INFO <<EOF
   "fedora-version": "$FEDORA_MAJOR_VERSION"
 }
 EOF
+
+sed -i "s/VARIANT_ID.*/VARIANT_ID=$IMAGE_NAME/" /etc/os-release