From 99b02a82fe1d30b80641a94adfea5fe5012aa937 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BChlbacher?= <tmuehlbacher@posteo.net>
Date: Sat, 22 Jun 2024 16:50:39 +0200
Subject: [PATCH] fixup! test(nix): add basic functionality testing infra

---
 checks/encrypted-multidev.sh | 3 +--
 checks/encrypted-unlock.sh   | 4 +---
 checks/outputs.sh            | 3 +--
 checks/subvolume.sh          | 3 +--
 4 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/checks/encrypted-multidev.sh b/checks/encrypted-multidev.sh
index bcd092e2..6899d0f2 100755
--- a/checks/encrypted-multidev.sh
+++ b/checks/encrypted-multidev.sh
@@ -2,7 +2,7 @@
 set -euxo pipefail
 
 blkdev="/dev/vdb"
-mnt="/tmp/mnt"
+mnt=$(mktemp -d)
 pw=$(genpass)
 uuid=$(uuidgen)
 
@@ -28,7 +28,6 @@ echo "$pw" | bcachefs format \
 
 udevadm settle
 
-mkdir -p "$mnt"
 echo "$pw" | bcachefs mount -v "UUID=$uuid" "$mnt"
 
 keyctl search @u user "bcachefs:$uuid"
diff --git a/checks/encrypted-unlock.sh b/checks/encrypted-unlock.sh
index 4f319adc..960744f3 100755
--- a/checks/encrypted-unlock.sh
+++ b/checks/encrypted-unlock.sh
@@ -2,7 +2,7 @@
 set -euxo pipefail
 
 blkdev="/dev/vdb"
-mnt="/tmp/mnt"
+mnt=$(mktemp -d)
 pw=$(genpass)
 uuid=$(uuidgen)
 
@@ -18,8 +18,6 @@ echo "$pw" | bcachefs format \
 
 udevadm settle
 
-mkdir -p "$mnt"
-
 bcachefs unlock -c "$blkdev"
 
 echo "$pw" | bcachefs unlock "$blkdev"
diff --git a/checks/outputs.sh b/checks/outputs.sh
index 91d51f28..c4e55127 100755
--- a/checks/outputs.sh
+++ b/checks/outputs.sh
@@ -2,7 +2,7 @@
 set -euxo pipefail
 
 blkdev="/dev/vdb"
-mnt="/tmp/mnt"
+mnt=$(mktemp -d)
 uuid=$(uuidgen)
 
 bcachefs format \
@@ -13,7 +13,6 @@ bcachefs format \
 
 udevadm settle
 
-mkdir -p "$mnt"
 mount "$blkdev" "$mnt"
 
 bcachefs show-super "$blkdev" | grep -i "external.*$uuid"
diff --git a/checks/subvolume.sh b/checks/subvolume.sh
index 620bbe81..179554ef 100755
--- a/checks/subvolume.sh
+++ b/checks/subvolume.sh
@@ -2,7 +2,7 @@
 set -euxo pipefail
 
 blkdev="/dev/vdb"
-mnt="/tmp/mnt"
+mnt=$(mktemp -d)
 uuid=$(uuidgen)
 
 bcachefs format \
@@ -13,7 +13,6 @@ bcachefs format \
 
 udevadm settle
 
-mkdir -p "$mnt"
 mount "$blkdev" "$mnt"
 
 touch "$mnt/file1"