swap: extend randomEncryption to plainOpen and ability to select cipher

This commit is contained in:
Martin Wohlert
2017-07-26 20:57:10 +03:00
committed by Nikolay Amiantov
parent 81e998bf0c
commit c3d5cfdc3c
2 changed files with 32 additions and 12 deletions
+1 -1
View File
@@ -207,7 +207,7 @@ let
preLVMCommands preDeviceCommands postDeviceCommands postMountCommands preFailCommands kernelModules;
resumeDevices = map (sd: if sd ? device then sd.device else "/dev/disk/by-label/${sd.label}")
(filter (sd: hasPrefix "/dev/" sd.device && !sd.randomEncryption
(filter (sd: hasPrefix "/dev/" sd.device && !sd.randomEncryption.enable
# Don't include zram devices
&& !(hasPrefix "/dev/zram" sd.device)
) config.swapDevices);