[iptables PATCH 01/23] xtables: Fix symlinks/names for ebtables-{save,restore}

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



While xtables-nft-multi only recognized ebtables-save and -restore,
Makefile did install only ebtables-nft-save and -restore symlinks. Clean
this up by making both name variants known and installing respective
symlinks, just like for ebtables and ebtables-nft.

Signed-off-by: Phil Sutter <phil@xxxxxx>
---
 iptables/Makefile.am         | 3 ++-
 iptables/xtables-nft-multi.c | 4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/iptables/Makefile.am b/iptables/Makefile.am
index a950d9fd69112..2cbd586128140 100644
--- a/iptables/Makefile.am
+++ b/iptables/Makefile.am
@@ -82,7 +82,8 @@ x_sbin_links  = iptables-nft iptables-nft-restore iptables-nft-save \
 		iptables-restore-translate ip6tables-restore-translate \
 		arptables-nft arptables \
 		ebtables-nft ebtables \
-		ebtables-nft-restore ebtables-nft-save \
+		ebtables-nft-restore ebtables-restore \
+		ebtables-nft-save ebtables-save \
 		xtables-monitor
 endif
 
diff --git a/iptables/xtables-nft-multi.c b/iptables/xtables-nft-multi.c
index 6fb8bd29e6ae4..d9cca088f27a8 100644
--- a/iptables/xtables-nft-multi.c
+++ b/iptables/xtables-nft-multi.c
@@ -34,9 +34,11 @@ static const struct subcommand multi_subcommands[] = {
 	{"arptables-nft",		xtables_arp_main},
 	{"ebtables-translate",		xtables_eb_xlate_main},
 	{"ebtables",			xtables_eb_main},
-	{"ebtables-nft",		xtables_eb_main},
 	{"ebtables-restore",		xtables_eb_restore_main},
 	{"ebtables-save",		xtables_eb_save_main},
+	{"ebtables-nft",		xtables_eb_main},
+	{"ebtables-nft-restore",	xtables_eb_restore_main},
+	{"ebtables-nft-save",		xtables_eb_save_main},
 	{"xtables-monitor",		xtables_monitor_main},
 	{NULL},
 };
-- 
2.18.0

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



[Index of Archives]     [Netfitler Users]     [LARTC]     [Bugtraq]     [Yosemite Forum]

  Powered by Linux