From cfa22fceb5f83653b9cdbccec077a03046877a74 Mon Sep 17 00:00:00 2001 From: Adrian Dudau Date: Tue, 20 Mar 2018 15:34:28 +0100 Subject: Move netfilter related configs under the same folder Rename them to reflect the type of config (_y,_n,_m) they execute. Signed-off-by: Adrian Dudau Signed-off-by: Martin Borg --- features/ct/ct.cfg | 11 ----------- features/ct/ct.scc | 4 ---- features/ip_vs/ip_vs.cfg | 4 ---- features/ip_vs/ip_vs.scc | 4 ---- features/ipset/ipset.cfg | 9 --------- features/ipset/ipset.scc | 4 ---- features/netfilter/ct_m.cfg | 11 +++++++++++ features/netfilter/ct_m.scc | 4 ++++ features/netfilter/ip_vs_m.cfg | 4 ++++ features/netfilter/ip_vs_m.scc | 4 ++++ features/netfilter/ipset_m.cfg | 9 +++++++++ features/netfilter/ipset_m.scc | 4 ++++ features/netfilter/physdev_m.cfg | 8 ++++++++ features/netfilter/physdev_m.scc | 4 ++++ features/netfilter/raw_m.cfg | 3 +++ features/netfilter/raw_m.scc | 4 ++++ features/physdev/physdev.cfg | 8 -------- features/physdev/physdev.scc | 4 ---- features/raw/raw.cfg | 3 --- features/raw/raw.scc | 4 ---- 20 files changed, 55 insertions(+), 55 deletions(-) delete mode 100644 features/ct/ct.cfg delete mode 100644 features/ct/ct.scc delete mode 100644 features/ip_vs/ip_vs.cfg delete mode 100644 features/ip_vs/ip_vs.scc delete mode 100644 features/ipset/ipset.cfg delete mode 100644 features/ipset/ipset.scc create mode 100644 features/netfilter/ct_m.cfg create mode 100644 features/netfilter/ct_m.scc create mode 100644 features/netfilter/ip_vs_m.cfg create mode 100644 features/netfilter/ip_vs_m.scc create mode 100644 features/netfilter/ipset_m.cfg create mode 100644 features/netfilter/ipset_m.scc create mode 100644 features/netfilter/physdev_m.cfg create mode 100644 features/netfilter/physdev_m.scc create mode 100644 features/netfilter/raw_m.cfg create mode 100644 features/netfilter/raw_m.scc delete mode 100644 features/physdev/physdev.cfg delete mode 100644 features/physdev/physdev.scc delete mode 100644 features/raw/raw.cfg delete mode 100644 features/raw/raw.scc diff --git a/features/ct/ct.cfg b/features/ct/ct.cfg deleted file mode 100644 index 9b469c0..0000000 --- a/features/ct/ct.cfg +++ /dev/null @@ -1,11 +0,0 @@ -CONFIG_NETFILTER=y -CONFIG_NETFILTER_ADVANCED=y -CONFIG_NF_CONNTRACK=y - -CONFIG_NETFILTER_XTABLES=y - -CONFIG_IP_NF_IPTABLES=y -CONFIG_IP_NF_RAW=m -CONFIG_NETFILTER_XT_TARGET_CT=m - -CONFIG_NF_CONNTRACK_ZONES=y diff --git a/features/ct/ct.scc b/features/ct/ct.scc deleted file mode 100644 index fefc211..0000000 --- a/features/ct/ct.scc +++ /dev/null @@ -1,4 +0,0 @@ -define KFEATURE_DESCRIPTION "Support for CT target in iptables" -define KFEATURE_COMPATIBILITY all - -kconf non-hardware ct.cfg diff --git a/features/ip_vs/ip_vs.cfg b/features/ip_vs/ip_vs.cfg deleted file mode 100644 index a4ae33d..0000000 --- a/features/ip_vs/ip_vs.cfg +++ /dev/null @@ -1,4 +0,0 @@ -CONFIG_NF_CONNTRACK=y -CONFIG_IP_VS=m - - diff --git a/features/ip_vs/ip_vs.scc b/features/ip_vs/ip_vs.scc deleted file mode 100644 index 08fa373..0000000 --- a/features/ip_vs/ip_vs.scc +++ /dev/null @@ -1,4 +0,0 @@ -define KFEATURE_DESCRIPTION "IP Virtual Server support" -define KFEATURE_COMPATIBILITY all - -kconf non-hardware ip_vs.cfg diff --git a/features/ipset/ipset.cfg b/features/ipset/ipset.cfg deleted file mode 100644 index 830a880..0000000 --- a/features/ipset/ipset.cfg +++ /dev/null @@ -1,9 +0,0 @@ -CONFIG_NETFILTER=y - -CONFIG_IP_SET=m -CONFIG_IP_SET_HASH_NET=m - -CONFIG_NETFILTER_ADVANCED=y -CONFIG_NETFILTER_XTABLES=y - -CONFIG_NETFILTER_XT_SET=m diff --git a/features/ipset/ipset.scc b/features/ipset/ipset.scc deleted file mode 100644 index d181607..0000000 --- a/features/ipset/ipset.scc +++ /dev/null @@ -1,4 +0,0 @@ -define KFEATURE_DESCRIPTION "Support for IP sets" -define KFEATURE_COMPATIBILITY all - -kconf non-hardware ipset.cfg diff --git a/features/netfilter/ct_m.cfg b/features/netfilter/ct_m.cfg new file mode 100644 index 0000000..9b469c0 --- /dev/null +++ b/features/netfilter/ct_m.cfg @@ -0,0 +1,11 @@ +CONFIG_NETFILTER=y +CONFIG_NETFILTER_ADVANCED=y +CONFIG_NF_CONNTRACK=y + +CONFIG_NETFILTER_XTABLES=y + +CONFIG_IP_NF_IPTABLES=y +CONFIG_IP_NF_RAW=m +CONFIG_NETFILTER_XT_TARGET_CT=m + +CONFIG_NF_CONNTRACK_ZONES=y diff --git a/features/netfilter/ct_m.scc b/features/netfilter/ct_m.scc new file mode 100644 index 0000000..3eadf1f --- /dev/null +++ b/features/netfilter/ct_m.scc @@ -0,0 +1,4 @@ +define KFEATURE_DESCRIPTION "Support for CT target in iptables" +define KFEATURE_COMPATIBILITY all + +kconf non-hardware ct_m.cfg diff --git a/features/netfilter/ip_vs_m.cfg b/features/netfilter/ip_vs_m.cfg new file mode 100644 index 0000000..a4ae33d --- /dev/null +++ b/features/netfilter/ip_vs_m.cfg @@ -0,0 +1,4 @@ +CONFIG_NF_CONNTRACK=y +CONFIG_IP_VS=m + + diff --git a/features/netfilter/ip_vs_m.scc b/features/netfilter/ip_vs_m.scc new file mode 100644 index 0000000..8be3313 --- /dev/null +++ b/features/netfilter/ip_vs_m.scc @@ -0,0 +1,4 @@ +define KFEATURE_DESCRIPTION "IP Virtual Server support" +define KFEATURE_COMPATIBILITY all + +kconf non-hardware ip_vs_m.cfg diff --git a/features/netfilter/ipset_m.cfg b/features/netfilter/ipset_m.cfg new file mode 100644 index 0000000..830a880 --- /dev/null +++ b/features/netfilter/ipset_m.cfg @@ -0,0 +1,9 @@ +CONFIG_NETFILTER=y + +CONFIG_IP_SET=m +CONFIG_IP_SET_HASH_NET=m + +CONFIG_NETFILTER_ADVANCED=y +CONFIG_NETFILTER_XTABLES=y + +CONFIG_NETFILTER_XT_SET=m diff --git a/features/netfilter/ipset_m.scc b/features/netfilter/ipset_m.scc new file mode 100644 index 0000000..eb2a52b --- /dev/null +++ b/features/netfilter/ipset_m.scc @@ -0,0 +1,4 @@ +define KFEATURE_DESCRIPTION "Support for IP sets" +define KFEATURE_COMPATIBILITY all + +kconf non-hardware ipset_m.cfg diff --git a/features/netfilter/physdev_m.cfg b/features/netfilter/physdev_m.cfg new file mode 100644 index 0000000..fb42ad0 --- /dev/null +++ b/features/netfilter/physdev_m.cfg @@ -0,0 +1,8 @@ +CONFIG_NETFILTER=y +CONFIG_NETFILTER_ADVANCED=y + +CONFIG_BRIDGE=y +CONFIG_BRIDGE_NETFILTER=y + +CONFIG_NETFILTER_XTABLES=y +CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m diff --git a/features/netfilter/physdev_m.scc b/features/netfilter/physdev_m.scc new file mode 100644 index 0000000..31f207b --- /dev/null +++ b/features/netfilter/physdev_m.scc @@ -0,0 +1,4 @@ +define KFEATURE_DESCRIPTION "Support for physdev packet matching" +define KFEATURE_COMPATIBILITY all + +kconf non-hardware physdev_m.cfg diff --git a/features/netfilter/raw_m.cfg b/features/netfilter/raw_m.cfg new file mode 100644 index 0000000..221a7bf --- /dev/null +++ b/features/netfilter/raw_m.cfg @@ -0,0 +1,3 @@ +CONFIG_NETFILTER=y +CONFIG_IP_NF_IPTABLES=y +CONFIG_IP_NF_RAW=m diff --git a/features/netfilter/raw_m.scc b/features/netfilter/raw_m.scc new file mode 100644 index 0000000..3daf6a8 --- /dev/null +++ b/features/netfilter/raw_m.scc @@ -0,0 +1,4 @@ +define KFEATURE_DESCRIPTION "Support for iptables raw table" +define KFEATURE_COMPATIBILITY all + +kconf non-hardware raw_m.cfg diff --git a/features/physdev/physdev.cfg b/features/physdev/physdev.cfg deleted file mode 100644 index fb42ad0..0000000 --- a/features/physdev/physdev.cfg +++ /dev/null @@ -1,8 +0,0 @@ -CONFIG_NETFILTER=y -CONFIG_NETFILTER_ADVANCED=y - -CONFIG_BRIDGE=y -CONFIG_BRIDGE_NETFILTER=y - -CONFIG_NETFILTER_XTABLES=y -CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m diff --git a/features/physdev/physdev.scc b/features/physdev/physdev.scc deleted file mode 100644 index 9f23046..0000000 --- a/features/physdev/physdev.scc +++ /dev/null @@ -1,4 +0,0 @@ -define KFEATURE_DESCRIPTION "Support for physdev packet matching" -define KFEATURE_COMPATIBILITY all - -kconf non-hardware physdev.cfg diff --git a/features/raw/raw.cfg b/features/raw/raw.cfg deleted file mode 100644 index 221a7bf..0000000 --- a/features/raw/raw.cfg +++ /dev/null @@ -1,3 +0,0 @@ -CONFIG_NETFILTER=y -CONFIG_IP_NF_IPTABLES=y -CONFIG_IP_NF_RAW=m diff --git a/features/raw/raw.scc b/features/raw/raw.scc deleted file mode 100644 index 8054d7b..0000000 --- a/features/raw/raw.scc +++ /dev/null @@ -1,4 +0,0 @@ -define KFEATURE_DESCRIPTION "Support for iptables raw table" -define KFEATURE_COMPATIBILITY all - -kconf non-hardware raw.cfg -- cgit v1.2.3-54-g00ecf