diff options
| author | Artturin <Artturin@artturin.com> | 2021-06-24 20:58:18 +0300 |
|---|---|---|
| committer | Artturin <Artturin@artturin.com> | 2021-07-20 20:51:27 +0300 |
| commit | c971de97c4146a052b731fd47babc8be395ffdf0 (patch) | |
| tree | d8d2787dbc73a4dc74e5137ee5a04608e8d6a964 /nixos | |
| parent | a3c5f0cba8fa9c4d9782ef83757be6e4028f54b7 (diff) | |
| download | nixpkgs-c971de97c4146a052b731fd47babc8be395ffdf0.tar nixpkgs-c971de97c4146a052b731fd47babc8be395ffdf0.tar.gz nixpkgs-c971de97c4146a052b731fd47babc8be395ffdf0.tar.bz2 nixpkgs-c971de97c4146a052b731fd47babc8be395ffdf0.tar.lz nixpkgs-c971de97c4146a052b731fd47babc8be395ffdf0.tar.xz nixpkgs-c971de97c4146a052b731fd47babc8be395ffdf0.tar.zst nixpkgs-c971de97c4146a052b731fd47babc8be395ffdf0.zip | |
nixos/swap: add options option
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/config/swap.nix | 9 | ||||
| -rw-r--r-- | nixos/modules/tasks/filesystems.nix | 2 |
2 files changed, 10 insertions, 1 deletions
diff --git a/nixos/modules/config/swap.nix b/nixos/modules/config/swap.nix index a37b46b8c46..9b64d5287a1 100644 --- a/nixos/modules/config/swap.nix +++ b/nixos/modules/config/swap.nix @@ -127,6 +127,15 @@ let ''; }; + options = mkOption { + default = [ "defaults" ]; + example = [ "nofail" ]; + type = types.listOf types.nonEmptyStr; + description = '' + Options used to mount the swap. + ''; + }; + deviceName = mkOption { type = types.str; internal = true; 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}"}" ); |