From e123b05ff4226fba308d0cffc259817fa3425d1d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 17 Aug 2022 15:54:28 +0200
Subject: use findmnt and mount with X-mount.mkdir

This feels slightly cleaner and makes the code shorter.
---
 lib/default.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'lib')

diff --git a/lib/default.nix b/lib/default.nix
index beba1b0..edc0062 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -88,9 +88,8 @@ let {
 
   mount.filesystem = q: x: {
       fs.${x.mountpoint} = ''
-        if ! [ "$(mount | sed -n 's:\([^ ]\+\) on /mnt${x.mountpoint} .*:\1:p')" = ${q.device} ]; then
-          mkdir -p /mnt${x.mountpoint}
-          mount ${q.device} /mnt${x.mountpoint}
+        if ! findmnt "${q.device}" "/mnt${x.mountpoint}" > /dev/null 2>&1; then
+          mount "${q.device}" "/mnt${x.mountpoint}" -o X-mount.mkdir
         fi
       '';
     };
-- 
cgit v1.2.3