Merge pull request #168793 from helsinki-systems/feat/systemd-stage-1-mdraid-merge

nixos/stage-1-init: Merge mdraid module into swraid

2 files changed, 5 insertions, 5 deletions

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index daef79e684d..cb68ef68530 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -521,8 +521,8 @@ in
   systemd-confinement = handleTest ./systemd-confinement.nix {};
   systemd-cryptenroll = handleTest ./systemd-cryptenroll.nix {};
   systemd-escaping = handleTest ./systemd-escaping.nix {};
-  systemd-initrd-mdraid = handleTest ./systemd-initrd-mdraid.nix {};
   systemd-initrd-simple = handleTest ./systemd-initrd-simple.nix {};
+  systemd-initrd-swraid = handleTest ./systemd-initrd-swraid.nix {};
   systemd-journal = handleTest ./systemd-journal.nix {};
   systemd-machinectl = handleTest ./systemd-machinectl.nix {};
   systemd-networkd = handleTest ./systemd-networkd.nix {};
diff --git a/nixos/tests/systemd-initrd-mdraid.nix b/nixos/tests/systemd-initrd-swraid.nix
index 0d8827558fb..28a0fb3192a 100644
--- a/nixos/tests/systemd-initrd-mdraid.nix
+++ b/nixos/tests/systemd-initrd-swraid.nix
@@ -1,5 +1,5 @@
 import ./make-test-python.nix ({ lib, pkgs, ... }: {
-  name = "systemd-initrd-mdraid";
+  name = "systemd-initrd-swraid";
 
   nodes.machine = { pkgs, ... }: {
     # Use systemd-boot
@@ -17,7 +17,7 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: {
         enable = true;
         emergencyAccess = true;
       };
-      services.mdraid = {
+      services.swraid = {
         enable = true;
         mdadmConf = ''
           ARRAY /dev/md0 devices=/dev/vdc,/dev/vdd
@@ -26,7 +26,7 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: {
       kernelModules = [ "raid0" ];
     };
 
-    specialisation.boot-mdraid.configuration.virtualisation.bootDevice = "/dev/disk/by-label/testraid";
+    specialisation.boot-swraid.configuration.virtualisation.bootDevice = "/dev/disk/by-label/testraid";
   };
 
   testScript = ''
@@ -36,7 +36,7 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: {
     machine.succeed("mkdir -p /mnt && mount /dev/md0 /mnt && echo hello > /mnt/test && umount /mnt")
 
     # Boot from the RAID
-    machine.succeed("bootctl set-default nixos-generation-1-specialisation-boot-mdraid.conf")
+    machine.succeed("bootctl set-default nixos-generation-1-specialisation-boot-swraid.conf")
     machine.succeed("sync")
     machine.crash()
     machine.wait_for_unit("multi-user.target")