diff options
| author | Linus Heckemann <git@sphalerite.org> | 2023-07-10 20:20:08 +0200 |
|---|---|---|
| committer | Linus Heckemann <git@sphalerite.org> | 2023-07-10 20:20:08 +0200 |
| commit | c0f963a33805a7906de59b1f4bd73962d0130d5b (patch) | |
| tree | 363fa9f54fb94e17bc2d84c2bf58501f7acf289e /nixos/modules/system/boot/stage-1.nix | |
| parent | 0b277bcc2b40c6ecd728c44635fa92262bedf620 (diff) | |
| download | nixpkgs-c0f963a33805a7906de59b1f4bd73962d0130d5b.tar nixpkgs-c0f963a33805a7906de59b1f4bd73962d0130d5b.tar.gz nixpkgs-c0f963a33805a7906de59b1f4bd73962d0130d5b.tar.bz2 nixpkgs-c0f963a33805a7906de59b1f4bd73962d0130d5b.tar.lz nixpkgs-c0f963a33805a7906de59b1f4bd73962d0130d5b.tar.xz nixpkgs-c0f963a33805a7906de59b1f4bd73962d0130d5b.tar.zst nixpkgs-c0f963a33805a7906de59b1f4bd73962d0130d5b.zip | |
boot.initrd.services.swraid -> boot.swraid
Since the option affects both stage-1 and stage-2, it does not make sense to keep it within the boot.initrd namespace.
Diffstat (limited to 'nixos/modules/system/boot/stage-1.nix')
| -rw-r--r-- | nixos/modules/system/boot/stage-1.nix | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix index dcb15cf7d42..81e5e974b9c 100644 --- a/nixos/modules/system/boot/stage-1.nix +++ b/nixos/modules/system/boot/stage-1.nix @@ -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" ]) ]; } |