aviallon/nixos-lib
1
0
Fork 0
mirror of https://github.com/aviallon/nixos-lib.git synced 2026-04-06 01:38:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[FileSystems] Fix some bugs happening if swap label does not exist

Browse source
This commit is contained in:
Antoine Viallon 2022-04-23 22:03:26 +02:00
parent a481ab4da6
commit da9d521545
Signed by: aviallon
GPG key ID: 186FC35EDEB25716
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
filesystems.nix
View file

@ -4,7 +4,8 @@ let
cfg = config.aviallon.filesystems; cfg = config.aviallon.filesystems;
getSwapDevice = index: ifEnable (length config.swapDevices > index) (elemAt config.swapDevices index); getSwapDevice = index: ifEnable (length config.swapDevices > index) (elemAt config.swapDevices index);
resumeDevice = ifEnable ((getSwapDevice 0) ? label ) ((getSwapDevice 0).label); firstSwapDevice = getSwapDevice 0;
resumeDeviceLabel = attrByPath [ "label" ] null firstSwapDevice;
ioSchedType = types.enum [ "bfq" "kyber" "mq-deadline" "none" null ]; ioSchedType = types.enum [ "bfq" "kyber" "mq-deadline" "none" null ];
in in
@ -60,7 +61,7 @@ in
]; ];
boot.kernelModules = ifEnable cfg.lvm [ "dm-cache" "dm-cache-smq" "dm-persistent-data" "dm-bio-prison" "dm-clone" "dm-crypt" "dm-writecache" "dm-mirror" "dm-snapshot"]; boot.kernelModules = ifEnable cfg.lvm [ "dm-cache" "dm-cache-smq" "dm-persistent-data" "dm-bio-prison" "dm-clone" "dm-crypt" "dm-writecache" "dm-mirror" "dm-snapshot"];
aviallon.boot.cmdline = { aviallon.boot.cmdline = {
resume = mkIf (! isNull resumeDevice) (mkDefault "LABEL=${resumeDevice}"); resume = mkIf (! isNull resumeDeviceLabel) (mkDefault "LABEL=${resumeDeviceLabel}");
}; };
fileSystems."/boot".neededForBoot = mkDefault true; fileSystems."/boot".neededForBoot = mkDefault true;