From 57434a290d1f29112e130620531286845476d63c Mon Sep 17 00:00:00 2001 From: John Audia Date: Thu, 9 Jan 2025 21:48:25 -0500 Subject: [PATCH] lxc: remove check for options we do not package We do not package lxc-net or lxcfs so remove the lines within lxc-checkconfig that looks forCONFIG_IP_NF_TARGET_MASQUERADE and CONFIG_IP6_NF_TARGET_MASQUERADE which, as far as I know, is the only part of lxc that needs them. Also remove the check for FUSE since we do not pakcage lxcfs. Without this commit, users will see these two as missing. Signed-off-by: John Audia --- ...eckconfig-remove-options-for-lxc-net.patch | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 utils/lxc/patches/019-lxc-checkconfig-remove-options-for-lxc-net.patch diff --git a/utils/lxc/patches/019-lxc-checkconfig-remove-options-for-lxc-net.patch b/utils/lxc/patches/019-lxc-checkconfig-remove-options-for-lxc-net.patch new file mode 100644 index 0000000000..4423b4e451 --- /dev/null +++ b/utils/lxc/patches/019-lxc-checkconfig-remove-options-for-lxc-net.patch @@ -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 ---" -- 2.30.2