From: Justin M. Forbes <jfor...@fedoraproject.org>

Fix up the RHEL configs for xtables and ipset

At some point, we had an MR which disabled xtables and ipset.  This put
configs to turn them off in the ark/generic directory.  Quite a bit
later, it was decided to rever that change, and MR2267 was created to do
that. In the meantime, the ark directory was renamed to rhel.  As that
MR was deleting files in ark, and they had already been deleted, this
was not raised as a problem, but we did not get the desired result
because those files do still exist in the rhel directory.  This change
simply deletes the files in the rhel/generic directory making things
work as MR2267 intended.

Link:https://gitlab.com/cki-project/kernel-ark/-/issues/105
Cc: Phil Sutter <psut...@redhat.com>
Signed-off-by: Justin M. Forbes <jfor...@fedoraproject.org>

diff --git a/redhat/configs/rhel/generic/CONFIG_BRIDGE_NETFILTER 
b/redhat/configs/rhel/generic/CONFIG_BRIDGE_NETFILTER
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/rhel/generic/CONFIG_BRIDGE_NETFILTER
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_BRIDGE_NETFILTER is not set
diff --git a/redhat/configs/rhel/generic/CONFIG_BRIDGE_NF_EBTABLES 
b/redhat/configs/rhel/generic/CONFIG_BRIDGE_NF_EBTABLES
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/rhel/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/rhel/generic/CONFIG_IP6_NF_IPTABLES 
b/redhat/configs/rhel/generic/CONFIG_IP6_NF_IPTABLES
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/rhel/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/rhel/generic/CONFIG_IP_NF_ARPTABLES 
b/redhat/configs/rhel/generic/CONFIG_IP_NF_ARPTABLES
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/rhel/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/rhel/generic/CONFIG_IP_NF_IPTABLES 
b/redhat/configs/rhel/generic/CONFIG_IP_NF_IPTABLES
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/rhel/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/rhel/generic/CONFIG_IP_SET 
b/redhat/configs/rhel/generic/CONFIG_IP_SET
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/rhel/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/rhel/generic/CONFIG_NETFILTER_XTABLES 
b/redhat/configs/rhel/generic/CONFIG_NETFILTER_XTABLES
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/rhel/generic/CONFIG_NETFILTER_XTABLES
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_NETFILTER_XTABLES is not set
diff --git a/redhat/configs/rhel/generic/CONFIG_NFT_COMPAT 
b/redhat/configs/rhel/generic/CONFIG_NFT_COMPAT
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/rhel/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/rhel/generic/CONFIG_NF_CONNTRACK_LABELS 
b/redhat/configs/rhel/generic/CONFIG_NF_CONNTRACK_LABELS
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/rhel/generic/CONFIG_NF_CONNTRACK_LABELS
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_NF_CONNTRACK_LABELS=y

--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2402
_______________________________________________
kernel mailing list -- kernel@lists.fedoraproject.org
To unsubscribe send an email to kernel-le...@lists.fedoraproject.org
Fedora Code of Conduct: 
https://docs.fedoraproject.org/en-US/project/code-of-conduct/
List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
List Archives: 
https://lists.fedoraproject.org/archives/list/kernel@lists.fedoraproject.org
Do not reply to spam, report it: 
https://pagure.io/fedora-infrastructure/new_issue

Reply via email to