Merge pull request #17792 from jflanglois/stage-1-zram

stage-1: exclude zram devices from resumeDevices

Changed files
+3 -1
nixos
modules
system
+3 -1
nixos/modules/system/boot/stage-1.nix
···
preLVMCommands preDeviceCommands postDeviceCommands postMountCommands preFailCommands 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) && !sd.randomEncryption) config.swapDevices);
+
(filter (sd: (sd ? label || hasPrefix "/dev/" sd.device) && !sd.randomEncryption
+
# Don't include zram devices
+
&& !(hasPrefix "/dev/zram" sd.device)) config.swapDevices);
fsInfo =
let f = fs: [ fs.mountPoint (if fs.device != null then fs.device else "/dev/disk/by-label/${fs.label}") fs.fsType (builtins.concatStringsSep "," fs.options) ];