sinavir
/
liminix
forked from dan/liminix
1
0
Fork 0
Code Pull Requests Activity

move SWCONFIG defn into per-device files 

it doesn't work on qemu
This commit is contained in:
Daniel Barlow 2023-08-31 23:50:07 +01:00
parent d60aab728d
commit e04ec2e959
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
devices/gl-mt300a/default.nix
View File

@ -18,7 +18,7 @@
support into the kernel even if we're using TFTP root support into the kernel even if we're using TFTP root
''; '';
module = { pkgs, config, ...}: module = { pkgs, config, lib, ...}:
let let
inherit (pkgs.liminix.networking) interface; inherit (pkgs.liminix.networking) interface;
inherit (pkgs) openwrt; inherit (pkgs) openwrt;
@ -151,6 +151,8 @@
PARTITION_ADVANCED = "y"; PARTITION_ADVANCED = "y";
PRINTK_TIME = "y"; PRINTK_TIME = "y";
} // lib.optionalAttrs (config.system.service ? vlan) {
SWCONFIG = "y";
}; };
}; };
}; };

4
devices/gl-mt300n-v2/default.nix
View File

@ -11,7 +11,7 @@
}; };
}; };
module = { pkgs, config, ...}: module = { pkgs, config, lib, ...}:
let let
inherit (pkgs.liminix.networking) interface; inherit (pkgs.liminix.networking) interface;
inherit (pkgs.liminix.services) oneshot; inherit (pkgs.liminix.services) oneshot;
@ -160,6 +160,8 @@
PARTITION_ADVANCED = "y"; PARTITION_ADVANCED = "y";
PRINTK_TIME = "y"; PRINTK_TIME = "y";
} // lib.optionalAttrs (config.system.service ? vlan) {
SWCONFIG = "y";
}; };
}; };
}; };

1
modules/vlan/default.nix
View File

@ -36,6 +36,5 @@ in
}; };
config.kernel.config = { config.kernel.config = {
VLAN_8021Q = "y"; VLAN_8021Q = "y";
SWCONFIG = "y"; # not always appropriate, some devices will use DSA
}; };
} }