diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-10-28 16:14:15 +0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-10-28 22:45:56 +0100 |
| commit | d5047faedef254d01a21618224698c190bb67e5b (patch) | |
| tree | 42a43de15611b5e35b2888f02fb940365edb1402 /nixos/modules/tasks/filesystems.nix | |
| parent | f4a418761b481b15900c78b8086e7be58b0afe4e (diff) | |
Remove uses of the "merge" option attribute
It's redundant because you can (and should) specify an option type, or
an apply function.
Diffstat (limited to 'nixos/modules/tasks/filesystems.nix')
| -rw-r--r-- | nixos/modules/tasks/filesystems.nix | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/nixos/modules/tasks/filesystems.nix b/nixos/modules/tasks/filesystems.nix index 6e3d019ea939..2b4fe582c372 100644 --- a/nixos/modules/tasks/filesystems.nix +++ b/nixos/modules/tasks/filesystems.nix @@ -43,8 +43,7 @@ let options = mkOption { default = "defaults,relatime"; example = "data=journal"; - type = types.string; - merge = pkgs.lib.concatStringsSep ","; + type = types.commas; description = "Options used to mount the file system."; }; |