Skip to content

Commit a8e75da

Browse files
committedApr 8, 2025·
disko-deactivate: fix jq syntax
1 parent 8f80668 commit a8e75da

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed
 

‎disk-deactivate/disk-deactivate.jq

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ def deactivate:
6969

7070
def walk:
7171
[
72-
(.mountpoints[] | select(. != null) | "umount -R (. | shellquote)"),
72+
(.mountpoints[] | select(. != null) | "umount -R \(. | shellquote)"),
7373
((.children // []) | map(walk)),
7474
remove,
7575
deactivate

‎tests/disko-install/default.nix

+2
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,8 @@ pkgs.nixosTest {
5555
permission = machine.succeed("stat -c %a /tmp/age.key").strip()
5656
assert permission == "600", f"expected permission 600 on /tmp/age.key, got {permission}"
5757
58+
# Some distros like to automount disks with spaces
59+
machine.succeed('mkdir -p "/mnt/with spaces" && mkfs.ext4 /dev/vdb && mount /dev/vdb "/mnt/with spaces"')
5860
machine.succeed("${disko}/bin/disko-install --disk main /dev/vdb --extra-files /tmp/age.key /var/lib/secrets/age.key --flake ${../..}#testmachine")
5961
# test idempotency
6062
machine.succeed("${disko}/bin/disko-install --mode mount --disk main /dev/vdb --flake ${../..}#testmachine")

0 commit comments

Comments
 (0)
Please sign in to comment.