diff options
| author | Phil Sutter <phil@nwl.cc> | 2018-07-11 12:09:05 +0200 |
|---|---|---|
| committer | Florian Westphal <fw@strlen.de> | 2018-07-11 12:32:13 +0200 |
| commit | 565a22395c4c620bf26a002515d9016db0c35824 (patch) | |
| tree | bdd870d971aed4539c8b082ab1687bec9dc89344 | |
| parent | c468f01f10f3f5d968bf894aa5f63c1113db3b7a (diff) | |
xtables: Support nft suffix for arptables and ebtables
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 <phil@nwl.cc>
Signed-off-by: Florian Westphal <fw@strlen.de>
| -rw-r--r-- | iptables/Makefile.am | 4 | ||||
| -rw-r--r-- | iptables/xtables-nft-multi.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/iptables/Makefile.am b/iptables/Makefile.am index 9e6f3f4b..800dd13a 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 187da81e..03690a56 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}, }; |