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 <phil@nwl.cc>
Signed-off-by: Florian Westphal <fw@strlen.de>

diff --git a/iptables/Makefile.am b/iptables/Makefile.am
index a950d9fd691129fb18b59c3d50037f9435b6a729..2cbd586128140234e056ee7c07baaf73e9519f1f 100644 (file)
--- 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 6fb8bd29e6ae4a53a8d6f8669b2941a0ca125dff..d9cca088f27a896fbeac2fb20fbbe8c174b4d95b 100644 (file)
--- 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},
 };