nix-community/disko
1
1
Fork 0
mirror of https://github.com/nix-community/disko.git synced 2024-09-19 18:47:16 +03:00
Code Issues Packages Projects Releases Wiki Activity

drop deprecated boot.initrd.services.swraid.enable option

Browse Source
This commit is contained in:
Jörg Thalheim 2023-08-11 08:32:16 +02:00 committed by mergify[bot]
parent b32f0e2876
commit 241c878d4b
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/tests.nix
View File

@ -171,9 +171,14 @@ let
lib.optional (lib.meta.availableOn pkgs.stdenv.hostPlatform config.boot.zfs.package) "zfs";
networking.hostId = "8425e349";
})
(if lib.versionAtLeast (lib.versions.majorMinor lib.version) "23.11" then {
boot.swraid.enable = true;
} else {
boot.initrd.services.swraid.enable = true;
})
];
boot.initrd.services.swraid.enable = true;
systemd.services.mdmonitor.enable = false; # silence some weird warnings
environment.systemPackages = [
@ -265,4 +270,3 @@ let
};
in
testLib

8
lib/types/mdadm.nix
View File

@ -59,7 +59,13 @@
internal = true;
readOnly = true;
default =
[{ boot.initrd.services.swraid.enable = true; }] ++
[
(if lib.versionAtLeast (lib.versions.majorMinor lib.version) "23.11" then {
boot.swraid.enable = true;
} else {
boot.initrd.services.swraid.enable = true;
})
] ++
lib.optional (config.content != null) config.content._config;
description = "NixOS configuration";
};