From 73e4cc7eb34bf5b1405000de77e9eeb1757b1949 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Thu, 26 Oct 2023 20:06:16 +0200
Subject: [PATCH] Fix condition, add a few echos to make debugging easier

---
 packages.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages.nix b/packages.nix
index 875cc0ad..a9668179 100644
--- a/packages.nix
+++ b/packages.nix
@@ -192,6 +192,7 @@ lib.attrsets.mapAttrs
             ${hostConfig.system.build.copyToServer} ${inputPaths} ${declaredRunnerDrvPath}
 
             ${hostConfig.system.build.runOnServer} bash -e <<END
+            set -eou pipefail
             ${createDirsCopyCurrent name}
 
             nix build -L --accept-flake-config -o current ${overrideInputsArgs} ${declaredRunnerDrvPath}
@@ -199,12 +200,14 @@ lib.attrsets.mapAttrs
 
             ${createSymlinks name}
 
-            if [[ -z NIXOS_REBUILD ]]; then
+            if [[ -n NIXOS_REBUILD ]]; then
+              echo "Restarting MicroVM..."
               systemctl restart microvm@${name}.service
             fi
             END
 
-            if [[ -n NIXOS_REBUILD ]]; then
+            if [[ -z NIXOS_REBUILD ]]; then
+              echo "Switching to configuration..."
               ssh ${target} -- ${toplevelOutPath}/bin/switch-to-configuration "''${@:-switch}"
             fi
           ''
@@ -222,6 +225,7 @@ lib.attrsets.mapAttrs
           ${hostConfig.system.build.copyToServer} ${declaredRunnerDrvPath}
 
           ${hostConfig.system.build.runOnServer} bash -e <<END
+          set -eou pipefail
           ${createDirsCopyCurrent name}
 
           ln -sfT ${hostConfig.microvm.declaredRunner} current