mirror of
https://github.com/nix-community/disko.git
synced 2024-09-11 06:25:33 +03:00
Merge pull request #84 from lilyinstarlight/fix/mountOptions
This commit is contained in:
commit
9e0142ae05
@ -109,7 +109,7 @@
|
||||
type = "filesystem";
|
||||
format = "ext4";
|
||||
mountpoint = "/ext4_on_lvm";
|
||||
options = [
|
||||
mountOptions = [
|
||||
"defaults"
|
||||
];
|
||||
};
|
||||
|
@ -17,7 +17,7 @@
|
||||
type = "filesystem";
|
||||
format = "vfat";
|
||||
mountpoint = "/boot";
|
||||
options = [
|
||||
mountOptions = [
|
||||
"defaults"
|
||||
];
|
||||
};
|
||||
@ -52,7 +52,7 @@
|
||||
type = "filesystem";
|
||||
format = "ext4";
|
||||
mountpoint = "/";
|
||||
options = [
|
||||
mountOptions = [
|
||||
"defaults"
|
||||
];
|
||||
};
|
||||
|
@ -89,7 +89,7 @@
|
||||
type = "filesystem";
|
||||
format = "ext4";
|
||||
mountpoint = "/";
|
||||
options = [
|
||||
mountOptions = [
|
||||
"defaults"
|
||||
];
|
||||
};
|
||||
|
@ -17,7 +17,7 @@
|
||||
type = "filesystem";
|
||||
format = "vfat";
|
||||
mountpoint = "/boot";
|
||||
options = [
|
||||
mountOptions = [
|
||||
"defaults"
|
||||
];
|
||||
};
|
||||
|
20
types.nix
20
types.nix
@ -266,7 +266,7 @@ rec {
|
||||
};
|
||||
mountOptions = mkOption {
|
||||
type = types.listOf types.str;
|
||||
default = [];
|
||||
default = [ "defaults" ];
|
||||
};
|
||||
_meta = mkOption {
|
||||
internal = true;
|
||||
@ -323,7 +323,7 @@ rec {
|
||||
};
|
||||
mountOptions = mkOption {
|
||||
type = types.listOf types.str;
|
||||
default = [];
|
||||
default = [ "defaults" ];
|
||||
};
|
||||
subvolumes = mkOption {
|
||||
type = types.listOf optionTypes.pathname;
|
||||
@ -376,6 +376,7 @@ rec {
|
||||
fileSystems.${config.mountpoint} = {
|
||||
device = dev;
|
||||
fsType = "btrfs";
|
||||
options = config.mountOptions;
|
||||
};
|
||||
}];
|
||||
};
|
||||
@ -400,11 +401,7 @@ rec {
|
||||
};
|
||||
mountOptions = mkOption {
|
||||
type = types.listOf types.str;
|
||||
default = [];
|
||||
};
|
||||
options = mkOption {
|
||||
type = types.listOf types.str;
|
||||
default = [];
|
||||
default = [ "defaults" ];
|
||||
};
|
||||
mountpoint = mkOption {
|
||||
type = optionTypes.absolute-pathname;
|
||||
@ -450,6 +447,7 @@ rec {
|
||||
fileSystems.${config.mountpoint} = {
|
||||
device = dev;
|
||||
fsType = config.format;
|
||||
options = config.mountOptions;
|
||||
};
|
||||
}];
|
||||
};
|
||||
@ -932,7 +930,7 @@ rec {
|
||||
};
|
||||
mountOptions = mkOption {
|
||||
type = types.listOf types.str;
|
||||
default = [];
|
||||
default = [ "defaults" ];
|
||||
};
|
||||
datasets = mkOption {
|
||||
type = types.attrsOf zfs_dataset;
|
||||
@ -990,7 +988,7 @@ rec {
|
||||
fileSystems.${config.mountpoint} = {
|
||||
device = config.name;
|
||||
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 {
|
||||
type = types.listOf types.str;
|
||||
default = [];
|
||||
default = [ "defaults" ];
|
||||
};
|
||||
|
||||
# filesystem options
|
||||
@ -1086,7 +1084,7 @@ rec {
|
||||
fileSystems.${config.mountpoint} = {
|
||||
device = "${zpool}/${config.name}";
|
||||
fsType = "zfs";
|
||||
options = lib.optional ((config.options.mountpoint or "") != "legacy") "zfsutil";
|
||||
options = config.mountOptions ++ lib.optional ((config.options.mountpoint or "") != "legacy") "zfsutil";
|
||||
};
|
||||
});
|
||||
};
|
||||
|
Loading…
Reference in New Issue
Block a user