From de50ac20aeed424f68e13c46188acb964ac7b954 Mon Sep 17 00:00:00 2001
From: RJ Trujillo <eyecantcu@pm.me>
Date: Wed, 6 Sep 2023 13:44:45 -0600
Subject: [PATCH] chore(hardware-setup): Use a versioned check instead of
 running once

---
 .../desktop/shared/usr/bin/bazzite-hardware-setup | 15 ++++++++++++---
 .../systemd/system/bazzite-hardware-setup.service |  1 -
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/system_files/desktop/shared/usr/bin/bazzite-hardware-setup b/system_files/desktop/shared/usr/bin/bazzite-hardware-setup
index 0ca68e57..768a3813 100755
--- a/system_files/desktop/shared/usr/bin/bazzite-hardware-setup
+++ b/system_files/desktop/shared/usr/bin/bazzite-hardware-setup
@@ -1,13 +1,22 @@
 #!/usr/bin/env bash
 source /etc/default/bazzite
 
-DONEFILE=/etc/bazzite/hardware_setup_done
+# SCRIPT VERSION
+HWS_VER=1
+HWS_VER_FILE="/etc/bazzite/hws_version"
+HWS_VER_RAN=$(cat $HWS_VERSION_FILE)
+
+if [[ -f $HWS_VER_FILE && $HWS_VER = $HWS_VER_RAN ]]; then
+  echo "Hardware setup has already ran. Exiting..."
+  exit 0
+fi
 
 # GLOBAL
 SYS_ID="$(cat /sys/devices/virtual/dmi/id/product_name)"
 KARGS=$(rpm-ostree kargs)
 NEEDED_KARGS=""
 echo "Current kargs: $KARGS"
+mkdir -p /etc/bazzite
 
 # FSTAB CONFIGURATION
 if [[ $(grep "compress=zstd" /etc/fstab) ]]; then
@@ -80,8 +89,8 @@ fi
 if [[ -n "$NEEDED_KARGS" ]]; then
   echo "Found needed karg changes, applying the following: $NEEDED_KARGS"
   rpm-ostree kargs ${NEEDED_KARGS} --reboot || exit 1
-  mkdir -p "$(dirname "$DONEFILE")"
-  touch "$DONEFILE"
 else
   echo "No karg changes needed"
 fi
+
+echo $HWS_VER > $HWS_VER_FILE
diff --git a/system_files/desktop/shared/usr/lib/systemd/system/bazzite-hardware-setup.service b/system_files/desktop/shared/usr/lib/systemd/system/bazzite-hardware-setup.service
index d49e1c13..ede1dd7b 100644
--- a/system_files/desktop/shared/usr/lib/systemd/system/bazzite-hardware-setup.service
+++ b/system_files/desktop/shared/usr/lib/systemd/system/bazzite-hardware-setup.service
@@ -2,7 +2,6 @@
 Description=Configure Bazzite for current hardware
 After=rpm-ostreed.service
 Before=systemd-user-sessions.service jupiter-biosupdate.service jupiter-controller-update.service
-ConditionPathExists=!/etc/bazzite/hardware_setup_done
 
 [Service]
 Type=oneshot