summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlassulus <lassulus@lassul.us>2022-12-03 14:12:33 +0100
committerlassulus <lassulus@lassul.us>2022-12-03 14:13:33 +0100
commitdaf5fe8e9bfbd17c569a7896bf48649e9eb94f80 (patch)
treeba829c5ea025990314673b1c9217589831b1d71d
parentdfb7bd89e1e4a49d880fa8348e56251db1e32915 (diff)
fix all mountOptions
-rw-r--r--types.nix8
1 files 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