From a8e75da08f462a2a4cc9a637643bda4eb1ea2d6c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 8 Apr 2025 19:53:48 +0200
Subject: [PATCH] disko-deactivate: fix jq syntax

---
 disk-deactivate/disk-deactivate.jq | 2 +-
 tests/disko-install/default.nix    | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/disk-deactivate/disk-deactivate.jq b/disk-deactivate/disk-deactivate.jq
index d762ac0..3e37b74 100644
--- a/disk-deactivate/disk-deactivate.jq
+++ b/disk-deactivate/disk-deactivate.jq
@@ -69,7 +69,7 @@ def deactivate:
 
 def walk:
   [
-    (.mountpoints[] | select(. != null) | "umount -R (. | shellquote)"),
+    (.mountpoints[] | select(. != null) | "umount -R \(. | shellquote)"),
     ((.children // []) | map(walk)),
     remove,
     deactivate
diff --git a/tests/disko-install/default.nix b/tests/disko-install/default.nix
index 340616d..042e99b 100644
--- a/tests/disko-install/default.nix
+++ b/tests/disko-install/default.nix
@@ -55,6 +55,8 @@ pkgs.nixosTest {
     permission = machine.succeed("stat -c %a /tmp/age.key").strip()
     assert permission == "600", f"expected permission 600 on /tmp/age.key, got {permission}"
 
+    # Some distros like to automount disks with spaces
+    machine.succeed('mkdir -p "/mnt/with spaces" && mkfs.ext4 /dev/vdb && mount /dev/vdb "/mnt/with spaces"')
     machine.succeed("${disko}/bin/disko-install --disk main /dev/vdb --extra-files /tmp/age.key /var/lib/secrets/age.key --flake ${../..}#testmachine")
     # test idempotency
     machine.succeed("${disko}/bin/disko-install --mode mount --disk main /dev/vdb --flake ${../..}#testmachine")