diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-07-23 12:02:01 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-23 12:02:01 +0000 |
| commit | 3bc17773a5238c508c6f330744db5970ea62e88e (patch) | |
| tree | 68f6787ec2dad2fc93aac86e551b07d126f97c1f /nixos/modules/tasks/filesystems.nix | |
| parent | 7bf8b97d6851a79ad6d4101befd30069827f70b3 (diff) | |
| parent | 55a4a2d60a420ca83f31e3f659beb295fd6b8626 (diff) | |
| download | nixpkgs-3bc17773a5238c508c6f330744db5970ea62e88e.tar nixpkgs-3bc17773a5238c508c6f330744db5970ea62e88e.tar.gz nixpkgs-3bc17773a5238c508c6f330744db5970ea62e88e.tar.bz2 nixpkgs-3bc17773a5238c508c6f330744db5970ea62e88e.tar.lz nixpkgs-3bc17773a5238c508c6f330744db5970ea62e88e.tar.xz nixpkgs-3bc17773a5238c508c6f330744db5970ea62e88e.tar.zst nixpkgs-3bc17773a5238c508c6f330744db5970ea62e88e.zip | |
Merge staging-next into staging
Diffstat (limited to 'nixos/modules/tasks/filesystems.nix')
| -rw-r--r-- | nixos/modules/tasks/filesystems.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/tasks/filesystems.nix b/nixos/modules/tasks/filesystems.nix index d274a38a270..2f17608560f 100644 --- a/nixos/modules/tasks/filesystems.nix +++ b/nixos/modules/tasks/filesystems.nix @@ -255,7 +255,7 @@ in # https://wiki.archlinux.org/index.php/fstab#Filepath_spaces escape = string: builtins.replaceStrings [ " " "\t" ] [ "\\040" "\\011" ] string; swapOptions = sw: concatStringsSep "," ( - [ "defaults" ] + sw.options ++ optional (sw.priority != null) "pri=${toString sw.priority}" ++ optional (sw.discardPolicy != null) "discard${optionalString (sw.discardPolicy != "both") "=${toString sw.discardPolicy}"}" ); |