From 92b9bf959ea09679f7d6f303024baabc71506943 Mon Sep 17 00:00:00 2001
From: Daniel Barlow <dan@telent.net>
Date: Mon, 30 Oct 2023 21:23:50 +0000
Subject: [PATCH] options.system.outputs.initramfs -> initramfs module

---
 modules/initramfs.nix | 24 +++++++++++++++++-------
 modules/jffs2.nix     | 10 ----------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/modules/initramfs.nix b/modules/initramfs.nix
index d807d284..0861d7c4 100644
--- a/modules/initramfs.nix
+++ b/modules/initramfs.nix
@@ -13,13 +13,23 @@ in
     boot.initramfs = {
       enable = mkEnableOption "initramfs";
     };
-    system.outputs.initramfs = mkOption {
-      type = types.package;
-      internal = true;
-      description = ''
-        Initramfs image capable of mounting the jffs2 root
-        filesystem
-      '';
+    system.outputs = {
+      initramfs = mkOption {
+        type = types.package;
+        internal = true;
+        description = ''
+          Initramfs image capable of mounting the real root
+          filesystem
+        '';
+      };
+      systemConfiguration = mkOption {
+        type = types.package;
+        description = ''
+          pkgs.systemconfig for the configured filesystem,
+          contains 'activate' and 'init' commands
+        '';
+        internal = true;
+      };
     };
   };
   config = mkIf config.boot.initramfs.enable {
diff --git a/modules/jffs2.nix b/modules/jffs2.nix
index 52dfdd1c..cb822e6a 100644
--- a/modules/jffs2.nix
+++ b/modules/jffs2.nix
@@ -11,16 +11,6 @@ in
   imports = [
     ./initramfs.nix
   ];
-  options.system.outputs = {
-    systemConfiguration = mkOption {
-      type = types.package;
-      description = ''
-        pkgs.systemconfig for the configured filesystem,
-        contains 'activate' and 'init' commands
-      '';
-      internal = true;
-    };
-  };
 
   config = mkIf (config.rootfsType == "jffs2") {
     kernel.config = {