liminix

commit efa1919e0457b65208bac5b42e1c0909a3d92cfd
parent de77635490f7513748be723f3f1239dc6c18b9b5
Author: Daniel Barlow <dan@telent.net>
Date:   Wed, 30 Aug 2023 22:59:28 +0100

move squashfs kernel options into module

Diffstat:
M
devices/gl-ar750/default.nix
 | 
2
--
M
devices/gl-mt300a/default.nix
 | 
2
--
M
devices/gl-mt300n-v2/default.nix
 | 
2
--
M
devices/qemu/default.nix
 | 
3
---
M
modules/squashfs.nix
 | 
4
++++

5 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/devices/gl-ar750/default.nix b/devices/gl-ar750/default.nix
@@ -204,8 +204,6 @@
 
           PARTITION_ADVANCED = "y";
           PRINTK_TIME = "y";
-          SQUASHFS = "y";
-          SQUASHFS_XZ = "y";
         };
       };
     };
diff --git a/devices/gl-mt300a/default.nix b/devices/gl-mt300a/default.nix
@@ -145,8 +145,6 @@
 
           PARTITION_ADVANCED = "y";
           PRINTK_TIME = "y";
-          SQUASHFS = "y";
-          SQUASHFS_XZ = "y";
         };
       };
     };
diff --git a/devices/gl-mt300n-v2/default.nix b/devices/gl-mt300n-v2/default.nix
@@ -171,8 +171,6 @@
 
           PARTITION_ADVANCED = "y";
           PRINTK_TIME = "y";
-          SQUASHFS = "y";
-          SQUASHFS_XZ = "y";
         };
       };
     };
diff --git a/devices/qemu/default.nix b/devices/qemu/default.nix
@@ -30,9 +30,6 @@
         MTD_BLKDEVS = "y";
         MTD_BLOCK = "y";
 
-        SQUASHFS = "y";
-        SQUASHFS_XZ = "y";
-
         VIRTIO_MENU = "y";
         PCI = "y";
         VIRTIO_PCI = "y";
diff --git a/modules/squashfs.nix b/modules/squashfs.nix
@@ -12,5 +12,9 @@ in
   config = mkIf (config.rootfsType == "squashfs") {
     system.outputs.rootfs =
       liminix.builders.squashfs config.filesystem.contents;
+    kernel.config = {
+      SQUASHFS = "y";
+      SQUASHFS_XZ = "y";
+    };
   };
 }