From daf5fe8e9bfbd17c569a7896bf48649e9eb94f80 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sat, 3 Dec 2022 14:12:33 +0100 Subject: [PATCH] fix all mountOptions --- types.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/types.nix b/types.nix index 87a34a9..bf9dc30 100644 --- a/types.nix +++ b/types.nix @@ -286,7 +286,7 @@ rec { fs.${config.mountpoint} = '' if ! findmnt ${dev} "/mnt${config.mountpoint}" > /dev/null 2>&1; then mount ${dev} "/mnt${config.mountpoint}" \ - ${concatStringsSep " " config.mountOptions} \ + ${concatMapStringsSep " " (opt: "-o ${opt}") config.mountOptions} \ -o X-mount.mkdir fi ''; @@ -360,7 +360,7 @@ rec { fs.${config.mountpoint} = '' if ! findmnt ${dev} "/mnt${config.mountpoint}" > /dev/null 2>&1; then mount ${dev} "/mnt${config.mountpoint}" \ - ${toString config.mountOptions} \ + ${concatMapStringsSep " " (opt: "-o ${opt}") config.mountOptions} \ -o X-mount.mkdir fi ''; @@ -895,7 +895,7 @@ rec { if ! findmnt ${config.name} "/mnt${config.mountpoint}" > /dev/null 2>&1; then mount ${config.name} "/mnt${config.mountpoint}" \ ${optionalString ((config.options.mountpoint or "") != "legacy") "-o zfsutil"} \ - ${toString config.mountOptions} \ + ${concatMapStringsSep " " (opt: "-o ${opt}") config.mountOptions} \ -o X-mount.mkdir \ -t zfs fi @@ -993,7 +993,7 @@ rec { if ! findmnt ${zpool}/${config.name} "/mnt${config.mountpoint}" > /dev/null 2>&1; then mount ${zpool}/${config.name} "/mnt${config.mountpoint}" \ -o X-mount.mkdir \ - ${toString config.mountOptions} \ + ${concatMapStringsSep " " (opt: "-o ${opt}") config.mountOptions} \ ${optionalString ((config.options.mountpoint or "") != "legacy") "-o zfsutil"} \ -t zfs fi