movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-13 13:40:28 +03:00
Code Activity

boot.initrd.services.swraid -> boot.swraid

Browse source 
Since the option affects both stage-1 and stage-2, it does not make
sense to keep it within the boot.initrd namespace.
This commit is contained in:
Linus Heckemann 2023-07-10 20:20:08 +02:00
parent 0b277bcc2b
commit c0f963a338
6 changed files with 39 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

5
nixos/modules/system/boot/stage-1.nix
View file

@ -354,9 +354,6 @@ let
[ { object = bootStage1;
symlink = "/init";
}
{ object = pkgs.writeText "mdadm.conf" config.boot.initrd.services.swraid.mdadmConf;
symlink = "/etc/mdadm.conf";
}
{ object = pkgs.runCommand "initrd-kmod-blacklist-ubuntu" {
src = "${pkgs.kmod-blacklist-ubuntu}/modprobe.conf";
preferLocalBuild = true;
@ -727,6 +724,6 @@ in
};
imports = [
(mkRenamedOptionModule [ "boot" "initrd" "mdadmConf" ] [ "boot" "initrd" "services" "swraid" "mdadmConf" ])
(mkRenamedOptionModule [ "boot" "initrd" "mdadmConf" ] [ "boot" "swraid" "mdadmConf" ])
];
}