nix-community/disko
1
1
Fork 0
mirror of https://github.com/nix-community/disko.git synced 2024-11-04 05:44:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix all mountOptions

Browse Source
This commit is contained in:
lassulus 2022-12-03 14:12:33 +01:00
parent dfb7bd89e1
commit daf5fe8e9b
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
types.nix
View File

@ -286,7 +286,7 @@ rec {
fs.${config.mountpoint} = '' fs.${config.mountpoint} = ''
if ! findmnt ${dev} "/mnt${config.mountpoint}" > /dev/null 2>&1; then if ! findmnt ${dev} "/mnt${config.mountpoint}" > /dev/null 2>&1; then
mount ${dev} "/mnt${config.mountpoint}" \ mount ${dev} "/mnt${config.mountpoint}" \
${concatStringsSep " " config.mountOptions} \ ${concatMapStringsSep " " (opt: "-o ${opt}") config.mountOptions} \
-o X-mount.mkdir -o X-mount.mkdir
fi fi
''; '';
@ -360,7 +360,7 @@ rec {
fs.${config.mountpoint} = '' fs.${config.mountpoint} = ''
if ! findmnt ${dev} "/mnt${config.mountpoint}" > /dev/null 2>&1; then if ! findmnt ${dev} "/mnt${config.mountpoint}" > /dev/null 2>&1; then
mount ${dev} "/mnt${config.mountpoint}" \ mount ${dev} "/mnt${config.mountpoint}" \
${toString config.mountOptions} \ ${concatMapStringsSep " " (opt: "-o ${opt}") config.mountOptions} \
-o X-mount.mkdir -o X-mount.mkdir
fi fi
''; '';
@ -895,7 +895,7 @@ rec {
if ! findmnt ${config.name} "/mnt${config.mountpoint}" > /dev/null 2>&1; then if ! findmnt ${config.name} "/mnt${config.mountpoint}" > /dev/null 2>&1; then
mount ${config.name} "/mnt${config.mountpoint}" \ mount ${config.name} "/mnt${config.mountpoint}" \
${optionalString ((config.options.mountpoint or "") != "legacy") "-o zfsutil"} \ ${optionalString ((config.options.mountpoint or "") != "legacy") "-o zfsutil"} \
${toString config.mountOptions} \ ${concatMapStringsSep " " (opt: "-o ${opt}") config.mountOptions} \
-o X-mount.mkdir \ -o X-mount.mkdir \
-t zfs -t zfs
fi fi
@ -993,7 +993,7 @@ rec {
if ! findmnt ${zpool}/${config.name} "/mnt${config.mountpoint}" > /dev/null 2>&1; then if ! findmnt ${zpool}/${config.name} "/mnt${config.mountpoint}" > /dev/null 2>&1; then
mount ${zpool}/${config.name} "/mnt${config.mountpoint}" \ mount ${zpool}/${config.name} "/mnt${config.mountpoint}" \
-o X-mount.mkdir \ -o X-mount.mkdir \
${toString config.mountOptions} \ ${concatMapStringsSep " " (opt: "-o ${opt}") config.mountOptions} \
${optionalString ((config.options.mountpoint or "") != "legacy") "-o zfsutil"} \ ${optionalString ((config.options.mountpoint or "") != "legacy") "-o zfsutil"} \
-t zfs -t zfs
fi fi