From efa1919e0457b65208bac5b42e1c0909a3d92cfd Mon Sep 17 00:00:00 2001 From: Daniel Barlow Date: Wed, 30 Aug 2023 22:59:28 +0100 Subject: [PATCH] move squashfs kernel options into module --- devices/gl-ar750/default.nix | 2 -- devices/gl-mt300a/default.nix | 2 -- devices/gl-mt300n-v2/default.nix | 2 -- devices/qemu/default.nix | 3 --- 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 index 51af49d..94d34e4 100644 --- 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 index 5b879e1..9fe80ef 100644 --- 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 index 3e1986a..576cc16 100644 --- 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 index f9d5af0..d7c5b20 100644 --- 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 index 2849aae..6137024 100644 --- 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"; + }; }; }