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

Merge pull request #37 from nix-community/zfs

Browse source 
zfs: fix nixos config options
This commit is contained in:
Jörg Thalheim 2022-09-05 16:28:42 +01:00 • committed by GitHub
commit 0d3295fcff
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
types.nix
View file

@ -763,7 +763,8 @@ rec {
(optionalAttrs (!isNull config.mountpoint) { (optionalAttrs (!isNull config.mountpoint) {
fileSystems.${config.mountpoint} = { fileSystems.${config.mountpoint} = {
device = config.name; device = config.name;
fsType = [ "zfs" ]; fsType = "zfs";
options = lib.optional ((config.options.mountpoint or "") != "legacy") "zfsutil";
}; };
}); });
}; };
@ -851,7 +852,8 @@ rec {
optionalAttrs (config.zfs_type == "filesystem" && config.options.mountpoint or "" != "none") { optionalAttrs (config.zfs_type == "filesystem" && config.options.mountpoint or "" != "none") {
fileSystems.${config.mountpoint} = { fileSystems.${config.mountpoint} = {
device = "${zpool}/${config.name}"; device = "${zpool}/${config.name}";
fsType = [ "zfs" ]; fsType = "zfs";
options = lib.optional ((config.options.mountpoint or "") != "legacy") "zfsutil";
}; };
}; };
}; };