Since the names without suffix clash with legacy tools, support the
suffixed versions as well to help distributions packaging for parallel
installation of both nft and legacy variants.

Signed-off-by: Phil Sutter <p...@nwl.cc>
---
 iptables/Makefile.am         | 4 +++-
 iptables/xtables-nft-multi.c | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/iptables/Makefile.am b/iptables/Makefile.am
index 9e6f3f4be508e..800dd13a4f29a 100644
--- a/iptables/Makefile.am
+++ b/iptables/Makefile.am
@@ -80,7 +80,9 @@ x_sbin_links  = iptables-nft iptables-nft-restore 
iptables-nft-save \
                ip6tables-nft ip6tables-nft-restore ip6tables-nft-save \
                iptables-translate ip6tables-translate \
                iptables-restore-translate ip6tables-restore-translate \
-               arptables ebtables xtables-monitor
+               arptables-nft arptables \
+               ebtables-nft ebtables \
+               xtables-monitor
 endif
 
 iptables-extensions.8: iptables-extensions.8.tmpl ../extensions/matches.man 
../extensions/targets.man
diff --git a/iptables/xtables-nft-multi.c b/iptables/xtables-nft-multi.c
index 187da81e9f59b..03690a56edb72 100644
--- a/iptables/xtables-nft-multi.c
+++ b/iptables/xtables-nft-multi.c
@@ -31,8 +31,10 @@ static const struct subcommand multi_subcommands[] = {
        {"iptables-restore-translate",  xtables_ip4_xlate_restore_main},
        {"ip6tables-restore-translate", xtables_ip6_xlate_restore_main},
        {"arptables",                   xtables_arp_main},
+       {"arptables-nft",               xtables_arp_main},
        {"ebtables-translate",          xtables_eb_xlate_main},
        {"ebtables",                    xtables_eb_main},
+       {"ebtables-nft",                xtables_eb_main},
        {"xtables-monitor",             xtables_monitor_main},
        {NULL},
 };
-- 
2.17.0

--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to