From: Phil Sutter psutter@redhat.com

Revert "redhat: configs: Disable xtables and ipset"

This reverts commit ebafea5303ae22b582590917be79c10f073d76fe.

It seems kernel-ark config is used for libvirt testing with upstream kernels. Libvirt still requires iptables, though. So revert this for now.

Contrary to reverted commit ebafea5303ae2, it is not sufficient to remove the disabling config snippets as the respective enabling ones have been moved from 'common' space to 'fedora'. Move them back.

Signed-off-by: Phil Sutter psutter@redhat.com

diff --git a/redhat/configs/ark/generic/CONFIG_BRIDGE_NETFILTER b/redhat/configs/ark/generic/CONFIG_BRIDGE_NETFILTER deleted file mode 100644 index blahblah..blahblah 0 --- a/redhat/configs/ark/generic/CONFIG_BRIDGE_NETFILTER +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_BRIDGE_NETFILTER is not set diff --git a/redhat/configs/ark/generic/CONFIG_BRIDGE_NF_EBTABLES b/redhat/configs/ark/generic/CONFIG_BRIDGE_NF_EBTABLES deleted file mode 100644 index blahblah..blahblah 0 --- a/redhat/configs/ark/generic/CONFIG_BRIDGE_NF_EBTABLES +++ /dev/null @@ -1,2 +0,0 @@ -# This CONFIG has been disabled in RHEL by RHEL Engineering. Please contact Red Hat Support for further assistance. -# CONFIG_BRIDGE_NF_EBTABLES is not set diff --git a/redhat/configs/ark/generic/CONFIG_IP6_NF_IPTABLES b/redhat/configs/ark/generic/CONFIG_IP6_NF_IPTABLES deleted file mode 100644 index blahblah..blahblah 0 --- a/redhat/configs/ark/generic/CONFIG_IP6_NF_IPTABLES +++ /dev/null @@ -1,2 +0,0 @@ -# This CONFIG has been disabled in RHEL by RHEL Engineering. Please contact Red Hat Support for further assistance. -# CONFIG_IP6_NF_IPTABLES is not set diff --git a/redhat/configs/ark/generic/CONFIG_IP_NF_ARPTABLES b/redhat/configs/ark/generic/CONFIG_IP_NF_ARPTABLES deleted file mode 100644 index blahblah..blahblah 0 --- a/redhat/configs/ark/generic/CONFIG_IP_NF_ARPTABLES +++ /dev/null @@ -1,2 +0,0 @@ -# This CONFIG has been disabled in RHEL by RHEL Engineering. Please contact Red Hat Support for further assistance. -# CONFIG_IP_NF_ARPTABLES is not set diff --git a/redhat/configs/ark/generic/CONFIG_IP_NF_IPTABLES b/redhat/configs/ark/generic/CONFIG_IP_NF_IPTABLES deleted file mode 100644 index blahblah..blahblah 0 --- a/redhat/configs/ark/generic/CONFIG_IP_NF_IPTABLES +++ /dev/null @@ -1,2 +0,0 @@ -# This CONFIG has been disabled in RHEL by RHEL Engineering. Please contact Red Hat Support for further assistance. -# CONFIG_IP_NF_IPTABLES is not set diff --git a/redhat/configs/ark/generic/CONFIG_IP_SET b/redhat/configs/ark/generic/CONFIG_IP_SET deleted file mode 100644 index blahblah..blahblah 0 --- a/redhat/configs/ark/generic/CONFIG_IP_SET +++ /dev/null @@ -1,2 +0,0 @@ -# This CONFIG has been disabled in RHEL by RHEL Engineering. Please contact Red Hat Support for further assistance. -# CONFIG_IP_SET is not set diff --git a/redhat/configs/ark/generic/CONFIG_NETFILTER_XTABLES b/redhat/configs/ark/generic/CONFIG_NETFILTER_XTABLES deleted file mode 100644 index blahblah..blahblah 0 --- a/redhat/configs/ark/generic/CONFIG_NETFILTER_XTABLES +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_NETFILTER_XTABLES is not set diff --git a/redhat/configs/ark/generic/CONFIG_NFT_COMPAT b/redhat/configs/ark/generic/CONFIG_NFT_COMPAT deleted file mode 100644 index blahblah..blahblah 0 --- a/redhat/configs/ark/generic/CONFIG_NFT_COMPAT +++ /dev/null @@ -1,2 +0,0 @@ -# This CONFIG has been disabled in RHEL by RHEL Engineering. Please contact Red Hat Support for further assistance. -# CONFIG_NFT_COMPAT is not set diff --git a/redhat/configs/ark/generic/CONFIG_NF_CONNTRACK_LABELS b/redhat/configs/ark/generic/CONFIG_NF_CONNTRACK_LABELS deleted file mode 100644 index blahblah..blahblah 0 --- a/redhat/configs/ark/generic/CONFIG_NF_CONNTRACK_LABELS +++ /dev/null @@ -1 +0,0 @@ -CONFIG_NF_CONNTRACK_LABELS=y diff --git a/redhat/configs/fedora/generic/CONFIG_BRIDGE_NETFILTER b/redhat/configs/common/generic/CONFIG_BRIDGE_NETFILTER rename from redhat/configs/fedora/generic/CONFIG_BRIDGE_NETFILTER rename to redhat/configs/common/generic/CONFIG_BRIDGE_NETFILTER index blahblah..blahblah 100644 --- a/redhat/configs/fedora/generic/CONFIG_BRIDGE_NETFILTER +++ b/redhat/configs/common/generic/CONFIG_BRIDGE_NETFILTER diff --git a/redhat/configs/fedora/generic/CONFIG_BRIDGE_NF_EBTABLES b/redhat/configs/common/generic/CONFIG_BRIDGE_NF_EBTABLES rename from redhat/configs/fedora/generic/CONFIG_BRIDGE_NF_EBTABLES rename to redhat/configs/common/generic/CONFIG_BRIDGE_NF_EBTABLES index blahblah..blahblah 100644 --- a/redhat/configs/fedora/generic/CONFIG_BRIDGE_NF_EBTABLES +++ b/redhat/configs/common/generic/CONFIG_BRIDGE_NF_EBTABLES diff --git a/redhat/configs/fedora/generic/CONFIG_IP6_NF_IPTABLES b/redhat/configs/common/generic/CONFIG_IP6_NF_IPTABLES rename from redhat/configs/fedora/generic/CONFIG_IP6_NF_IPTABLES rename to redhat/configs/common/generic/CONFIG_IP6_NF_IPTABLES index blahblah..blahblah 100644 --- a/redhat/configs/fedora/generic/CONFIG_IP6_NF_IPTABLES +++ b/redhat/configs/common/generic/CONFIG_IP6_NF_IPTABLES diff --git a/redhat/configs/fedora/generic/CONFIG_IP_NF_ARPTABLES b/redhat/configs/common/generic/CONFIG_IP_NF_ARPTABLES rename from redhat/configs/fedora/generic/CONFIG_IP_NF_ARPTABLES rename to redhat/configs/common/generic/CONFIG_IP_NF_ARPTABLES index blahblah..blahblah 100644 --- a/redhat/configs/fedora/generic/CONFIG_IP_NF_ARPTABLES +++ b/redhat/configs/common/generic/CONFIG_IP_NF_ARPTABLES diff --git a/redhat/configs/fedora/generic/CONFIG_IP_NF_IPTABLES b/redhat/configs/common/generic/CONFIG_IP_NF_IPTABLES rename from redhat/configs/fedora/generic/CONFIG_IP_NF_IPTABLES rename to redhat/configs/common/generic/CONFIG_IP_NF_IPTABLES index blahblah..blahblah 100644 --- a/redhat/configs/fedora/generic/CONFIG_IP_NF_IPTABLES +++ b/redhat/configs/common/generic/CONFIG_IP_NF_IPTABLES diff --git a/redhat/configs/fedora/generic/CONFIG_IP_SET b/redhat/configs/common/generic/CONFIG_IP_SET rename from redhat/configs/fedora/generic/CONFIG_IP_SET rename to redhat/configs/common/generic/CONFIG_IP_SET index blahblah..blahblah 100644 --- a/redhat/configs/fedora/generic/CONFIG_IP_SET +++ b/redhat/configs/common/generic/CONFIG_IP_SET diff --git a/redhat/configs/fedora/generic/CONFIG_NETFILTER_XTABLES b/redhat/configs/common/generic/CONFIG_NETFILTER_XTABLES rename from redhat/configs/fedora/generic/CONFIG_NETFILTER_XTABLES rename to redhat/configs/common/generic/CONFIG_NETFILTER_XTABLES index blahblah..blahblah 100644 --- a/redhat/configs/fedora/generic/CONFIG_NETFILTER_XTABLES +++ b/redhat/configs/common/generic/CONFIG_NETFILTER_XTABLES diff --git a/redhat/configs/fedora/generic/CONFIG_NFT_COMPAT b/redhat/configs/common/generic/CONFIG_NFT_COMPAT rename from redhat/configs/fedora/generic/CONFIG_NFT_COMPAT rename to redhat/configs/common/generic/CONFIG_NFT_COMPAT index blahblah..blahblah 100644 --- a/redhat/configs/fedora/generic/CONFIG_NFT_COMPAT +++ b/redhat/configs/common/generic/CONFIG_NFT_COMPAT

-- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2267