From: Phil Sutter <phil@nwl.cc>
To: Pablo Neira Ayuso <pablo@netfilter.org>
Cc: netfilter-devel@vger.kernel.org
Subject: [nft PATCH] files: Move netdev-ingress.nft to /etc/nftables as well
Date: Mon, 24 Jun 2019 17:12:38 +0200 [thread overview]
Message-ID: <20190624151238.4869-1-phil@nwl.cc> (raw)
Commit 13535a3b40b62 ("files: restore base table skeletons") moved
config skeletons back from examples/ to /etc/nftables/ directory, but
ignored the fact that commit 6c9230e79339c ("nftables: rearrange files
and examples") added a new file 'netdev-ingress.nft' which is referenced
from 'all-in-one.nft' as well.
Fixes: 13535a3b40b62 ("files: restore base table skeletons")
Signed-off-by: Phil Sutter <phil@nwl.cc>
---
files/nftables/Makefile.am | 3 ++-
files/{examples => nftables}/netdev-ingress.nft | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
rename files/{examples => nftables}/netdev-ingress.nft (87%)
diff --git a/files/nftables/Makefile.am b/files/nftables/Makefile.am
index f18156d844e5c..a93b7978f62d4 100644
--- a/files/nftables/Makefile.am
+++ b/files/nftables/Makefile.am
@@ -10,7 +10,8 @@ dist_pkgsysconf_DATA = all-in-one.nft \
ipv6-filter.nft \
ipv6-mangle.nft \
ipv6-nat.nft \
- ipv6-raw.nft
+ ipv6-raw.nft \
+ netdev-ingress.nft
install-data-hook:
${SED} -i 's|@sbindir[@]|${sbindir}/|g' ${DESTDIR}${pkgsysconfdir}/*.nft
diff --git a/files/examples/netdev-ingress.nft b/files/nftables/netdev-ingress.nft
similarity index 87%
rename from files/examples/netdev-ingress.nft
rename to files/nftables/netdev-ingress.nft
index 2585d15493885..9e46b15a7e596 100755
--- a/files/examples/netdev-ingress.nft
+++ b/files/nftables/netdev-ingress.nft
@@ -1,4 +1,4 @@
-#!/usr/sbin/nft -f
+#!@sbindir@nft -f
# mind the NIC, it must exists
table netdev filter {
--
2.21.0
next reply other threads:[~2019-06-24 15:12 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-24 15:12 Phil Sutter [this message]
2019-06-24 15:14 ` [nft PATCH] files: Move netdev-ingress.nft to /etc/nftables as well Florian Westphal
2019-06-24 16:24 ` Phil Sutter
2019-06-24 16:49 ` Florian Westphal
2019-06-25 0:24 ` Pablo Neira Ayuso
2019-07-03 10:56 ` Phil Sutter
2019-07-03 11:06 ` Pablo Neira Ayuso
2019-07-03 11:06 ` Pablo Neira Ayuso
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190624151238.4869-1-phil@nwl.cc \
--to=phil@nwl.cc \
--cc=netfilter-devel@vger.kernel.org \
--cc=pablo@netfilter.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox