From f1bf13d0a4b72131f70da04fd8d085696c68d02c Mon Sep 17 00:00:00 2001
From: phaer <phaer@phaer.org>
Date: Fri, 3 Apr 2026 13:31:35 +0200
Subject: [PATCH] nixos/stage-1,swraid: move mdadmConf rename to swraid.nix

stage-1.nix had mkRenamedOptionModule from boot.initrd.mdadmConf to
boot.swraid.mdadmConf. Move it to tasks/swraid.nix where the target
option is defined.
---
 nixos/modules/system/boot/stage-1.nix | 1 -
 nixos/modules/tasks/swraid.nix        | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix
index 343777d05c3a..003ff7c78cff 100644
--- a/nixos/modules/system/boot/stage-1.nix
+++ b/nixos/modules/system/boot/stage-1.nix
@@ -786,6 +786,5 @@ in
   };
 
   imports = [
-    (mkRenamedOptionModule [ "boot" "initrd" "mdadmConf" ] [ "boot" "swraid" "mdadmConf" ])
   ];
 }
diff --git a/nixos/modules/tasks/swraid.nix b/nixos/modules/tasks/swraid.nix
index 01bc91b1b896..556bb45a456b 100644
--- a/nixos/modules/tasks/swraid.nix
+++ b/nixos/modules/tasks/swraid.nix
@@ -26,6 +26,7 @@ in
       [ "boot" "initrd" "services" "swraid" "mdadmConf" ]
       [ "boot" "swraid" "mdadmConf" ]
     )
+    (lib.mkRenamedOptionModule [ "boot" "initrd" "mdadmConf" ] [ "boot" "swraid" "mdadmConf" ])
   ];
 
   options.boot.swraid = {