From ff05734cdfbba5cbdfaa9a79af086139db0a50aa Mon Sep 17 00:00:00 2001
From: Manuel Thalmann <m@nuth.ch>
Date: Thu, 5 Dec 2024 09:45:08 +0100
Subject: [PATCH] Partition drives after action setup

---
 scripts/Common/OS/setup.fish | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/scripts/Common/OS/setup.fish b/scripts/Common/OS/setup.fish
index eb4dc65a..8aea81c4 100755
--- a/scripts/Common/OS/setup.fish
+++ b/scripts/Common/OS/setup.fish
@@ -39,6 +39,15 @@ function runSetup
         end
 
         initBackupConfig --action restore
+        echo "Partitioning drives..."
+
+        begin
+            set -l script (mktemp)
+            chmod +x "$script"
+            and getOSConfig partition.script >"$script"
+            and "$script"
+            and rm "$script"
+        end
 
         if [ -n "$VALHALLA_BACKUP_SERVER_KEY" ]
             set -l knownHosts /root/.ssh/known_hosts
@@ -77,15 +86,6 @@ function runSetup
         end | runChroot "$mountDir" tee /root/.bash_profile >/dev/null
     end
 
-    function actionPreRun
-        set -l script (mktemp)
-        echo "Partitioning drives..."
-        chmod +x "$script"
-        and getOSConfig partition.script >"$script"
-        and "$script"
-        and rm "$script"
-    end
-
     function actionPostRun
         echo "Setup finished!"
         and echo "This machine will reboot in 5 seconds..."