liminix

commit 80528376a2cdb3f16ebcd0d090c9dbdcc813cea4
parent d707345891b8b2efe40ba9d3805e10ee73d0ece5
Author: Daniel Barlow <dan@telent.net>
Date:   Mon, 11 Dec 2023 21:47:15 +0000

move o.systemConfiguration to initramfs module

as far as I can tell, we define it identically in every module
that uses initramfs

Diffstat:
M
modules/outputs/ext4fs.nix
 | 
2
--
M
modules/outputs/initramfs.nix
 | 
2
++
M
modules/outputs/jffs2.nix
 | 
2
--
M
modules/outputs/ubifs.nix
 | 
2
--

4 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/modules/outputs/ext4fs.nix b/modules/outputs/ext4fs.nix
@@ -20,8 +20,6 @@ in
     };
     boot.initramfs.enable = true;
     system.outputs = {
-      systemConfiguration =
-        pkgs.systemconfig config.filesystem.contents;
       rootfs =
         let
           inherit (pkgs.pkgsBuildBuild) runCommand e2fsprogs;
diff --git a/modules/outputs/initramfs.nix b/modules/outputs/initramfs.nix
@@ -53,6 +53,8 @@ in
           file /init ${pkgs.preinit}/bin/preinit 0755 0 0
           SPECIALS
         '';
+      systemConfiguration =
+        pkgs.systemconfig config.filesystem.contents;
     };
   };
 }
diff --git a/modules/outputs/jffs2.nix b/modules/outputs/jffs2.nix
@@ -24,8 +24,6 @@ in
     };
     boot.initramfs.enable = true;
     system.outputs = {
-      systemConfiguration =
-        pkgs.systemconfig config.filesystem.contents;
       rootfs =
         let
           inherit (pkgs.pkgsBuildBuild) runCommand mtdutils;
diff --git a/modules/outputs/ubifs.nix b/modules/outputs/ubifs.nix
@@ -26,8 +26,6 @@ in
     };
     boot.initramfs.enable = true;
     system.outputs = {
-      systemConfiguration =
-        pkgs.systemconfig config.filesystem.contents;
       rootfs =
         let
           inherit (pkgs.pkgsBuildBuild) runCommand mtdutils;