lxc: add missing deps

Note - this PR is dependent on openwrt/openwrt#17553 Several deps are missing based the output of lxc-checkconfig shown below before this commit is applied. CONFIG_IP_NF_TARGET_MASQUERADE and CONFIG_IP6_NF_TARGET_MASQUERADE are only needed for lxc-net which we do not package. % lxc-checkconfig | grep missing Cgroup device: missing CONFIG_IP_NF_TARGET_MASQUERADE: missing CONFIG_IP6_NF_TARGET_MASQUERADE: missing CONFIG_NETFILTER_XT_TARGET_CHECKSUM: missing FUSE (for use with lxcfs): missing checkpoint restore: missing CONFIG_UNIX_DIAG: missing CONFIG_INET_DIAG: missing CONFIG_PACKET_DIAG: missing CONFIG_NETLINK_DIAG: missing Additionally, two new patches have been added which remove checks for options that OpenWrt currently does not package and can serve are false positives for missing items from our kernel config, namely: lxc-net and lxc-checkpoint Signed-off-by: John Audia <[email protected]>
openwrt · Jan 20, 2025 · 71979b6 · 71979b6
1 parent 01fceee
commit 71979b6
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
diff --git a/utils/lxc/Config.in b/utils/lxc/Config.in
@@ -8,6 +8,7 @@ config LXC_KERNEL_OPTIONS
 	select KERNEL_NAMESPACES
 	select KERNEL_DEVPTS_MULTIPLE_INSTANCES
 	select KERNEL_POSIX_MQUEUE
+	select KERNEL_CGROUP_DEVICE
 	select KERNEL_CGROUP_SCHED
 	select KERNEL_FAIR_GROUP_SCHED
 	select KERNEL_RT_GROUP_SCHED
@@ -16,6 +17,7 @@ config LXC_KERNEL_OPTIONS
 	select KERNEL_MEMCG_KMEM
 	select KERNEL_CPUSETS
 	select PACKAGE_kmod-ikconfig
+	select PACKAGE_kmod-unix-diag
 	help
 	  Select needed kernel options for LXC related utilities. Options
 	  include cgroups, namespaces and other miscellaneous options. These
@@ -50,6 +52,10 @@ config LXC_NETWORKING
 	default n
 	select PACKAGE_kmod-veth
 	select PACKAGE_kmod-macvlan
+	select PACKAGE_kmod-inet-diag
+	select PACKAGE_kmod-ipt-checksum
+	select PACKAGE_kmod-netlink-diag
+	select PACKAGE_kmod-packet-diag
 	help
 	  Enable "veth pair device" and "macvlan"
 

diff --git a/utils/lxc/patches/017-lxc-checkconfig-remove-options-for-lxc-checkpoint.patch b/utils/lxc/patches/017-lxc-checkconfig-remove-options-for-lxc-checkpoint.patch
@@ -0,0 +1,12 @@
+--- a/src/lxc/cmd/lxc-checkconfig.in
++++ b/src/lxc/cmd/lxc-checkconfig.in
+@@ -266,9 +266,6 @@ printf "CONFIG_NETFILTER_XT_MATCH_COMMEN
+ echo
+
+ echo "
+---- Checkpoint/Restore ---"
+-printf "checkpoint restore: " && is_enabled CONFIG_CHECKPOINT_RESTORE
+-echo
+ printf "CONFIG_FHANDLE: " && is_enabled CONFIG_FHANDLE
+ echo
+ printf "CONFIG_EVENTFD: " && is_enabled CONFIG_EVENTFD