technofab/disko
1
0
Fork 0
mirror of https://github.com/TECHNOFAB11/disko.git synced 2025-12-12 16:10:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

types: split zfs_dataset into zfs_fs & zfs_volume

Browse source
This commit is contained in:
lassulus 2023-04-07 18:29:48 +02:00
parent 654ecb386e
commit 7d70009c26
7 changed files with 100 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

5
types/zpool.nix
View file

@ -38,7 +38,8 @@
description = "Options to pass to mount";
};
datasets = lib.mkOption {
type = lib.types.attrsOf subTypes.zfs_dataset;
type = lib.types.attrsOf (diskoLib.subType { inherit (subTypes) zfs_fs zfs_volume; });
# type = lib.types.attrsOf subTypes.zfs_fs;
description = "List of datasets to define";
};
_meta = lib.mkOption {
@ -72,7 +73,7 @@
zpool list '${config.name}' >/dev/null 2>/dev/null || zpool import '${config.name}'
${lib.concatMapStrings (x: x.dev or "") (lib.attrValues datasetMounts)}
'';
fs = datasetMounts.fs // lib.optionalAttrs (config.mountpoint != null) {
fs = (datasetMounts.fs or {}) // lib.optionalAttrs (config.mountpoint != null) {
${config.mountpoint} = ''
if ! findmnt ${config.name} "${rootMountPoint}${config.mountpoint}" > /dev/null 2>&1; then
mount ${config.name} "${rootMountPoint}${config.mountpoint}" \