From 79146b86fce6a12483b3990d2d5715e882f83536 Mon Sep 17 00:00:00 2001
From: HikariKnight <2557889+HikariKnight@users.noreply.github.com>
Date: Wed, 17 Apr 2024 05:26:57 +0200
Subject: [PATCH 1/2] fix: Correctly apply vfio after initramfs changes (#987)

* fix: replace enable/disable action with virt-on/off

also fixed the heredoc for looking-glass shm

* chore: update initramfs command when enabling vfio
---
 .../share/ublue-os/just/84-bazzite-virt.just  | 21 +++++++++----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/system_files/desktop/shared/usr/share/ublue-os/just/84-bazzite-virt.just b/system_files/desktop/shared/usr/share/ublue-os/just/84-bazzite-virt.just
index 06fd9a6914..b821c8292e 100644
--- a/system_files/desktop/shared/usr/share/ublue-os/just/84-bazzite-virt.just
+++ b/system_files/desktop/shared/usr/share/ublue-os/just/84-bazzite-virt.just
@@ -20,8 +20,8 @@ setup-virtualization ACTION="":
     if [ "$OPTION" == "help" ]; then
       echo "Usage: ujust configure-grub <option>"
       echo "  <option>: Specify the quick option to skip the prompt"
-      echo "  Use 'enable' to select Enable Virtualization"
-      echo "  Use 'disable' to select Disable Virtualization"
+      echo "  Use 'virt-on' to select Enable Virtualization"
+      echo "  Use 'virt-off' to select Disable Virtualization"
       echo "  Use 'group' to select Add $USER to libvirt group"
       echo "  Use 'vfio-on' to select Enable VFIO drivers"
       echo "  Use 'vfio-off' to select Disable VFIO drivers"
@@ -40,7 +40,7 @@ setup-virtualization ACTION="":
         "Autocreate Looking-Glass shm" \
       )
     fi
-    if [[ "${OPTION,,}" =~ ^enable(|[[:space:]]virtualization) ]]; then
+    if [[ "${OPTION,,}" =~ (^enable[[:space:]]virtualization|virt-on) ]]; then
       virt_test=$(rpm-ostree status | grep -A 4 "●" | grep "virt-manager")
       if [[ -z ${virt_test} ]]; then
         echo "Installing QEMU and virt-manager..."
@@ -50,7 +50,7 @@ setup-virtualization ACTION="":
         --append-if-missing="kvm.report_ignored_msrs=0"
         echo 'Please re-run "ujust setup-virtualization" after the reboot to enable libvirtd service'
       fi
-    elif [[ "${OPTION,,}" =~ ^disable(|[[:space:]]virtualization) ]]; then
+    elif [[ "${OPTION,,}" =~ (^disable[[:space:]]virtualization|virt-off) ]]; then
       virt_test=$(rpm-ostree status | grep -A 4 "●" | grep "virt-manager")
       if [[ ${virt_test} ]]; then
         if [ "$(systemctl is-enabled libvirtd.service)" == "enabled" ]; then
@@ -76,7 +76,7 @@ setup-virtualization ACTION="":
       VENDOR_KARG="unset"
       if [[ ${VIRT_TEST} == *kvm.report_ignored_msrs* ]]; then
         echo 'add_drivers+=" vfio vfio_iommu_type1 vfio-pci "' | sudo tee /etc/dracut.conf.d/vfio.conf
-        sudo touch /etc/bazzite/initramfs/rebuild
+        rpm-ostree initramfs --enable
         if [[ ${CPU_VENDOR} == "AuthenticAMD" ]]; then
           VENDOR_KARG="amd_iommu=on"
         elif [[ ${CPU_VENDOR} == "GenuineIntel" ]]; then
@@ -118,8 +118,7 @@ setup-virtualization ACTION="":
         fi
         echo "Removing dracut modules"
         sudo rm /etc/dracut.conf.d/vfio.conf
-        echo "Issuing initramfs rebuild for next boot"
-        sudo touch /etc/bazzite/initramfs/rebuild
+        rpm-ostree initramfs --enable
         rpm-ostree kargs \
         --delete-if-present="iommu=pt" \
         --delete-if-present="iommu=on" \
@@ -147,10 +146,10 @@ setup-virtualization ACTION="":
         exit 0
       fi
       echo "Creating tmpfile definition for shm file in /etc/tmpfiles.d/"
-      sudo bash -c "tee << LOOKING_GLASS_TMP > /etc/tmpfiles.d/10-looking-glass.conf
-      # Type Path               Mode UID  GID Age Argument
-      f /dev/shm/looking-glass 0660 1000 qemu -
-      LOOKING_GLASS_TMP"
+      sudo bash -c "cat << LOOKING_GLASS_TMP > /etc/tmpfiles.d/10-looking-glass.conf
+    # Type Path               Mode UID  GID Age Argument
+    f /dev/shm/looking-glass 0660 1000 qemu -
+    LOOKING_GLASS_TMP"
       echo "Adding SELinux context record for /dev/shm/looking-glass"
       sudo semanage fcontext -a -t svirt_tmpfs_t /dev/shm/looking-glass
     elif [[ "${OPTION,,}" =~ group ]]; then

From c96bc6fb6985365d569f1f157b8d640c45607779 Mon Sep 17 00:00:00 2001
From: Noel Miller <4983138+noelmiller@users.noreply.github.com>
Date: Wed, 17 Apr 2024 16:17:49 -0500
Subject: [PATCH 2/2] feat: add command to support rebasing (#989)

---
 .../shared/usr/share/ublue-os/just/80-bazzite.just  | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/system_files/desktop/shared/usr/share/ublue-os/just/80-bazzite.just b/system_files/desktop/shared/usr/share/ublue-os/just/80-bazzite.just
index ac3f4781e8..98d246a2e9 100644
--- a/system_files/desktop/shared/usr/share/ublue-os/just/80-bazzite.just
+++ b/system_files/desktop/shared/usr/share/ublue-os/just/80-bazzite.just
@@ -17,6 +17,19 @@ restore-original-terminal:
         echo "Done. Change your default Terminal in System Settings to complete the swap."
     fi
 
+# Install System Flatpaks (Support for Rebasing)
+_install-system-flatpaks:
+    #!/usr/bin/bash
+    IMAGE_INFO="/usr/share/ublue-os/image-info.json"
+    BASE_IMAGE_NAME=$(jq -r '."base-image-name"' < $IMAGE_INFO)
+    if [[ ${BASE_IMAGE_NAME} == 'silverblue' ]]; then
+        FLATPAKS="gnome_flatpaks/flatpaks"
+    else
+        FLATPAKS="kde_flatpaks/flatpaks"
+    fi
+    FLATPAK_LIST="$(curl https://raw.githubusercontent.com/ublue-os/bazzite/main/scripts/${FLATPAKS} | tr '\n' ' ')"
+    flatpak --system -y install ${FLATPAK_LIST}
+
 # Install Bazzite's Steam Game Mode Startup Video
 install-gamemode-video:
     mkdir -p $HOME/.local/share/Steam/config/uioverrides/movies