diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2015-10-18 21:20:46 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2015-10-20 15:56:12 +0300 |
| commit | de8b8b35a41b2f1611be5da4697ab39a6d2fa2e3 (patch) | |
| tree | 5c51d32185eea335f341ea51ad35315ac450e60c /nixos/modules/system | |
| parent | 5c56b7e526db1865ffd5a3d5040774e308267132 (diff) | |
| download | nixlib-de8b8b35a41b2f1611be5da4697ab39a6d2fa2e3.tar nixlib-de8b8b35a41b2f1611be5da4697ab39a6d2fa2e3.tar.gz nixlib-de8b8b35a41b2f1611be5da4697ab39a6d2fa2e3.tar.bz2 nixlib-de8b8b35a41b2f1611be5da4697ab39a6d2fa2e3.tar.lz nixlib-de8b8b35a41b2f1611be5da4697ab39a6d2fa2e3.tar.xz nixlib-de8b8b35a41b2f1611be5da4697ab39a6d2fa2e3.tar.zst nixlib-de8b8b35a41b2f1611be5da4697ab39a6d2fa2e3.zip | |
nixos/swap: refactor, add randomEncryption option
Diffstat (limited to 'nixos/modules/system')
| -rw-r--r-- | nixos/modules/system/boot/stage-1.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix index ace2d10ec9c1..fe34e8227289 100644 --- a/nixos/modules/system/boot/stage-1.nix +++ b/nixos/modules/system/boot/stage-1.nix @@ -206,7 +206,7 @@ let preLVMCommands postDeviceCommands postMountCommands kernelModules; resumeDevices = map (sd: if sd ? device then sd.device else "/dev/disk/by-label/${sd.label}") - (filter (sd: sd ? label || hasPrefix "/dev/" sd.device) config.swapDevices); + (filter (sd: (sd ? label || hasPrefix "/dev/" sd.device) && !sd.randomEncryption) config.swapDevices); fsInfo = let f = fs: [ fs.mountPoint (if fs.device != null then fs.device else "/dev/disk/by-label/${fs.label}") fs.fsType fs.options ]; |