nix-community/disko
1
1
Fork 0
mirror of https://github.com/nix-community/disko.git synced 2024-09-20 02:57:09 +03:00
Code Issues Packages Projects Releases Wiki Activity

zpool: don't mount created datasets directly; and fix encrypted import

Browse Source 
This is necessary to support non-legacy mounts, since
the creation order and the required mounting order can be
different in order to not shadow any datasets.

Adding -l to the import statement is necessary to allow
encrypted datasets to be mounted later using disko-mount.
This commit is contained in:
oddlama 2023-04-29 19:42:44 +02:00
parent 617c77a440
commit b320fcd543
No known key found for this signature in database
GPG Key ID: 14EFE510775FE39A
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
types/zfs_fs.nix
View File

@ -38,8 +38,11 @@
}; };
_create = diskoLib.mkCreateOption { _create = diskoLib.mkCreateOption {
inherit config options; inherit config options;
# -u prevents mounting newly created datasets, which is
# important to prevent accidental shadowing of mount points
# since (create order != mount order)
default = { zpool }: '' default = { zpool }: ''
zfs create ${zpool}/${config.name} \ zfs create -u ${zpool}/${config.name} \
${lib.concatStringsSep " " (lib.mapAttrsToList (n: v: "-o ${n}=${v}") config.options)} ${lib.concatStringsSep " " (lib.mapAttrsToList (n: v: "-o ${n}=${v}") config.options)}
''; '';
}; };

2
types/zpool.nix
View File

@ -82,7 +82,7 @@
{ {
dev = '' dev = ''
zpool list '${config.name}' >/dev/null 2>/dev/null || \ zpool list '${config.name}' >/dev/null 2>/dev/null || \
zpool import -R ${config.mountRoot} '${config.name}' zpool import -l -R ${config.mountRoot} '${config.name}'
${lib.concatMapStrings (x: x.dev or "") (lib.attrValues datasetMounts)} ${lib.concatMapStrings (x: x.dev or "") (lib.attrValues datasetMounts)}
''; '';
fs = (datasetMounts.fs or {}) // lib.optionalAttrs (config.mountpoint != null) { fs = (datasetMounts.fs or {}) // lib.optionalAttrs (config.mountpoint != null) {