Unverified Commit a604b522 authored by K900's avatar K900 Committed by GitHub
Browse files

Merge pull request #254429 from ctheune/fix-swraid-for-old-init 

nixos/swraid: fix regression for old initrd and add test coverage
parents dd27dcf0 0e1a8027

nixos/modules/tasks/swraid.nix

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ in { 
        $out/bin/mdadm --version

      '';



      extraFiles."/etc/mdadm.conf" = mdadm_conf;

      extraFiles."/etc/mdadm.conf".source = pkgs.writeText "mdadm.conf" mdadm_conf.text;



      systemd = {

        contents."/etc/mdadm.conf".text = mdadm_conf.text;

nixos/tests/systemd-initrd-swraid.nix

+3 −0
Original line number Diff line number Diff line
@@ -32,6 +32,9 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: { 
    };



    specialisation.boot-swraid.configuration.virtualisation.rootDevice = "/dev/disk/by-label/testraid";

    # This protects against a regression. We do not have to switch to it.

    # It's sufficient to trigger its evaluation.

    specialisation.build-old-initrd.configuration.boot.initrd.systemd.enable = lib.mkForce false;

  };



  testScript = ''