Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

lxc: add missing deps #25719

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

lxc: add missing deps #25719

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
01fceee
lxc: remove check for options we do not package
graysky2 Jan 10, 2025
bf4f9fa
lxc: add missing deps
graysky2 Jan 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions utils/lxc/Config.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,12 @@ menu "Configuration"
config LXC_KERNEL_OPTIONS
bool "Enable kernel support for LXC"
default n
select KERNEL_CHECKPOINT_RESTORE
select KERNEL_CGROUPS
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
Expand All @@ -16,6 +18,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
Expand Down Expand Up @@ -50,6 +53,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"

Expand Down
19 changes: 19 additions & 0 deletions utils/lxc/patches/019-lxc-checkconfig-remove-options-for-lxc-net.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
--- a/src/lxc/cmd/lxc-checkconfig.in
+++ b/src/lxc/cmd/lxc-checkconfig.in
@@ -250,16 +250,10 @@ if { [ "${KVER_MAJOR}" -gt 3 ] && [ "${K
printf "CONFIG_NF_NAT_IPV6: " && is_enabled CONFIG_NF_NAT_IPV6 && is_probed nf_nat_ipv6
fi
echo
-printf "CONFIG_IP_NF_TARGET_MASQUERADE: " && is_enabled CONFIG_IP_NF_TARGET_MASQUERADE && is_probed nf_nat_masquerade_ipv4
-echo
-printf "CONFIG_IP6_NF_TARGET_MASQUERADE: " && is_enabled CONFIG_IP6_NF_TARGET_MASQUERADE && is_probed nf_nat_masquerade_ipv6
-echo
printf "CONFIG_NETFILTER_XT_TARGET_CHECKSUM: " && is_enabled CONFIG_NETFILTER_XT_TARGET_CHECKSUM && is_probed xt_CHECKSUM
echo
printf "CONFIG_NETFILTER_XT_MATCH_COMMENT: " && is_enabled CONFIG_NETFILTER_XT_MATCH_COMMENT && is_probed xt_comment
echo
-printf "FUSE (for use with lxcfs): " && is_enabled CONFIG_FUSE_FS && is_probed fuse
-echo

echo "
--- Checkpoint/Restore ---"
Loading