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

Merge pull request #84 from lilyinstarlight/fix/mountOptions

Browse Source
This commit is contained in:
Lassulus 2022-12-23 19:26:23 +01:00 committed by GitHub
commit 9e0142ae05
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
example/complex.nix
View File

@ -109,7 +109,7 @@
type = "filesystem"; type = "filesystem";
format = "ext4"; format = "ext4";
mountpoint = "/ext4_on_lvm"; mountpoint = "/ext4_on_lvm";
options = [ mountOptions = [
"defaults" "defaults"
]; ];
}; };

4
example/luks-lvm.nix
View File

@ -17,7 +17,7 @@
type = "filesystem"; type = "filesystem";
format = "vfat"; format = "vfat";
mountpoint = "/boot"; mountpoint = "/boot";
options = [ mountOptions = [
"defaults" "defaults"
]; ];
}; };
@ -52,7 +52,7 @@
type = "filesystem"; type = "filesystem";
format = "ext4"; format = "ext4";
mountpoint = "/"; mountpoint = "/";
options = [ mountOptions = [
"defaults" "defaults"
]; ];
}; };

2
example/lvm-raid.nix
View File

@ -89,7 +89,7 @@
type = "filesystem"; type = "filesystem";
format = "ext4"; format = "ext4";
mountpoint = "/"; mountpoint = "/";
options = [ mountOptions = [
"defaults" "defaults"
]; ];
}; };

2
example/zfs-over-legacy.nix
View File

@ -17,7 +17,7 @@
type = "filesystem"; type = "filesystem";
format = "vfat"; format = "vfat";
mountpoint = "/boot"; mountpoint = "/boot";
options = [ mountOptions = [
"defaults" "defaults"
]; ];
}; };

20
types.nix
View File

@ -266,7 +266,7 @@ rec {
}; };
mountOptions = mkOption { mountOptions = mkOption {
type = types.listOf types.str; type = types.listOf types.str;
default = []; default = [ "defaults" ];
}; };
_meta = mkOption { _meta = mkOption {
internal = true; internal = true;
@ -323,7 +323,7 @@ rec {
}; };
mountOptions = mkOption { mountOptions = mkOption {
type = types.listOf types.str; type = types.listOf types.str;
default = []; default = [ "defaults" ];
}; };
subvolumes = mkOption { subvolumes = mkOption {
type = types.listOf optionTypes.pathname; type = types.listOf optionTypes.pathname;
@ -376,6 +376,7 @@ rec {
fileSystems.${config.mountpoint} = { fileSystems.${config.mountpoint} = {
device = dev; device = dev;
fsType = "btrfs"; fsType = "btrfs";
options = config.mountOptions;
}; };
}]; }];
}; };
@ -400,11 +401,7 @@ rec {
}; };
mountOptions = mkOption { mountOptions = mkOption {
type = types.listOf types.str; type = types.listOf types.str;
default = []; default = [ "defaults" ];
};
options = mkOption {
type = types.listOf types.str;
default = [];
}; };
mountpoint = mkOption { mountpoint = mkOption {
type = optionTypes.absolute-pathname; type = optionTypes.absolute-pathname;
@ -450,6 +447,7 @@ rec {
fileSystems.${config.mountpoint} = { fileSystems.${config.mountpoint} = {
device = dev; device = dev;
fsType = config.format; fsType = config.format;
options = config.mountOptions;
}; };
}]; }];
}; };
@ -932,7 +930,7 @@ rec {
}; };
mountOptions = mkOption { mountOptions = mkOption {
type = types.listOf types.str; type = types.listOf types.str;
default = []; default = [ "defaults" ];
}; };
datasets = mkOption { datasets = mkOption {
type = types.attrsOf zfs_dataset; type = types.attrsOf zfs_dataset;
@ -990,7 +988,7 @@ rec {
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"; options = config.mountOptions ++ lib.optional ((config.options.mountpoint or "") != "legacy") "zfsutil";
}; };
}) })
]; ];
@ -1024,7 +1022,7 @@ rec {
}; };
mountOptions = mkOption { mountOptions = mkOption {
type = types.listOf types.str; type = types.listOf types.str;
default = []; default = [ "defaults" ];
}; };
# filesystem options # filesystem options
@ -1086,7 +1084,7 @@ rec {
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"; options = config.mountOptions ++ lib.optional ((config.options.mountpoint or "") != "legacy") "zfsutil";
}; };
}); });
}; };