From: Phil Sutter Date: Thu, 2 Aug 2018 15:05:18 +0000 (+0200) Subject: xtables: Fix symlinks/names for ebtables-{save, restore} X-Git-Tag: v1.8.1~97 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f988fe49839015c6e798a1d4e805aaf52691dbf7;p=thirdparty%2Fiptables.git xtables: Fix symlinks/names for ebtables-{save, restore} 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 Signed-off-by: Florian Westphal --- diff --git a/iptables/Makefile.am b/iptables/Makefile.am index a950d9fd..2cbd5861 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 6fb8bd29..d9cca088 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}, };