From 85e4de22698dd273fe2b75902f2e006aa90c6f35 Mon Sep 17 00:00:00 2001 From: Phil Sutter Date: Thu, 22 Dec 2022 17:14:34 +0100 Subject: ebtables-translate: Install symlink Make this officially a tool, we have enough test coverage in place. Also update xtables-translate.8 to mention it at least and generate ebtables-translate.8 which points to it. Signed-off-by: Phil Sutter --- iptables/.gitignore | 1 + iptables/Makefile.am | 6 +++--- iptables/xtables-translate.8 | 13 +++++++++---- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/iptables/.gitignore b/iptables/.gitignore index 245e1245..8141e34d 100644 --- a/iptables/.gitignore +++ b/iptables/.gitignore @@ -1,3 +1,4 @@ +/ebtables-translate.8 /ip6tables /ip6tables.8 /ip6tables-apply.8 diff --git a/iptables/Makefile.am b/iptables/Makefile.am index 4353dd00..1f37640f 100644 --- a/iptables/Makefile.am +++ b/iptables/Makefile.am @@ -69,7 +69,7 @@ dist_pkgdata_DATA = iptables.xslt if ENABLE_NFTABLES man_MANS += iptables-translate.8 ip6tables-translate.8 \ iptables-restore-translate.8 ip6tables-restore-translate.8 \ - xtables-monitor.8 + xtables-monitor.8 ebtables-translate.8 dist_man_MANS = xtables-nft.8 xtables-translate.8 xtables-legacy.8 \ arptables-nft.8 arptables-nft-restore.8 arptables-nft-save.8 \ @@ -89,7 +89,7 @@ endif if ENABLE_NFTABLES x_sbin_links = iptables-nft iptables-nft-restore iptables-nft-save \ ip6tables-nft ip6tables-nft-restore ip6tables-nft-save \ - iptables-translate ip6tables-translate \ + iptables-translate ip6tables-translate ebtables-translate \ iptables-restore-translate ip6tables-restore-translate \ arptables-nft arptables \ arptables-nft-restore arptables-restore \ @@ -105,7 +105,7 @@ iptables-extensions.8: iptables-extensions.8.tmpl ../extensions/matches.man ../e -e '/@MATCH@/ r ../extensions/matches.man' \ -e '/@TARGET@/ r ../extensions/targets.man' $< >$@; -iptables-translate.8 ip6tables-translate.8 iptables-restore-translate.8 ip6tables-restore-translate.8: +iptables-translate.8 ip6tables-translate.8 iptables-restore-translate.8 ip6tables-restore-translate.8 ebtables-translate.8: ${AM_VERBOSE_GEN} echo '.so man8/xtables-translate.8' >$@ ip6tables.8 ip6tables-apply.8 ip6tables-restore.8 ip6tables-save.8: diff --git a/iptables/xtables-translate.8 b/iptables/xtables-translate.8 index 3dc72760..a048e8c9 100644 --- a/iptables/xtables-translate.8 +++ b/iptables/xtables-translate.8 @@ -28,9 +28,12 @@ iptables-translate \(em translation tool to migrate from iptables to nftables .P ip6tables-translate \(em translation tool to migrate from ip6tables to nftables +.P +ebtables-translate \(em translation tool to migrate from ebtables to nftables .SH DESCRIPTION There is a set of tools to help the system administrator translate a given -ruleset from \fBiptables(8)\fP and \fBip6tables(8)\fP to \fBnftables(8)\fP. +ruleset from \fBiptables(8)\fP, \fBip6tables(8)\fP and \fBebtables(8)\fP to +\fBnftables(8)\fP. The available commands are: @@ -42,9 +45,12 @@ iptables-restore-translate ip6tables-translate .IP \[bu] ip6tables-restore-translate +.IP \[bu] 2 +ebtables-translate .SH USAGE -They take as input the original \fBiptables(8)\fP/\fBip6tables(8)\fP syntax and +They take as input the original +\fBiptables(8)\fP/\fBip6tables(8)\fP/\fBebtables(8)\fP syntax and output the native \fBnftables(8)\fP syntax. The \fBiptables-restore-translate\fP tool reads a ruleset in the syntax @@ -117,8 +123,7 @@ Some (few) extensions may be not supported (or fully-supported) for whatever reason (for example, they were considered obsolete, or we didn't have the time to work on them). -There are no translations available for \fBebtables(8)\fP and -\fBarptables(8)\fP. +There is no translation available for \fBarptables(8)\fP. To get up-to-date information about this, please head to \fBhttps://wiki.nftables.org/\fP. -- cgit v1.2.3