Merge pull request #197 from tulilirockz/fix-boot-scripts-slowdown

fix(desktop): boot scripts slowdown
ublue-os · Aug 28, 2023 · 93c8e71 · 93c8e71
2 parents 3433a25 + 9452a41
commit 93c8e71
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/system_files/desktop/shared/usr/bin/bazzite-hardware-setup b/system_files/desktop/shared/usr/bin/bazzite-hardware-setup
@@ -1,6 +1,8 @@
 #!/usr/bin/env bash
 source /etc/default/bazzite
 
+DONEFILE=/etc/bazzite/hardware_setup_done
+
 # GLOBAL
 SYS_ID="$(cat /sys/devices/virtual/dmi/id/product_name)"
 KARGS=$(rpm-ostree kargs)
@@ -75,9 +77,11 @@ if [[ ! $KARGS =~ "rd.luks.options" ]]; then
   NEEDED_KARGS="$NEEDED_KARGS --append=rd.luks.options=discard"
 fi
 
-if [[ ! -z "$NEEDED_KARGS" ]]; then
+if [[ -n "$NEEDED_KARGS" ]]; then
   echo "Found needed karg changes, applying the following: $NEEDED_KARGS"
-  rpm-ostree kargs ${NEEDED_KARGS} --reboot
+  rpm-ostree kargs ${NEEDED_KARGS} --reboot || exit 1
+  mkdir -p "$(dirname "$DONEFILE")"
+  touch "$DONEFILE"
 else
   echo "No karg changes needed"
 fi
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
@@ -7,6 +7,7 @@ Before=systemd-user-sessions.service jupiter-biosupdate.service jupiter-controll
 Type=oneshot
 RemainAfterExit=yes
 ExecStart=/usr/bin/bazzite-hardware-setup
+ConditionPathExists=!/etc/bazzite/hardware_setup_done
 
 [Install]
 WantedBy=multi-user.target