summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhil Sutter <phil@nwl.cc>2019-06-24 17:12:38 +0200
committerPablo Neira Ayuso <pablo@netfilter.org>2019-07-03 13:08:17 +0200
commitb76a2e2e78f0267f966cc88bf724cf96c2f14566 (patch)
tree7bd1a883793df6759ed0052397291ca5a2918143
parent57ca420f02acb3cac948c43916076452bcb00734 (diff)
files: Move netdev-ingress.nft to /etc/nftables as well
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> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
-rw-r--r--files/nftables/Makefile.am3
-rwxr-xr-xfiles/nftables/netdev-ingress.nft (renamed from files/examples/netdev-ingress.nft)2
2 files changed, 3 insertions, 2 deletions
diff --git a/files/nftables/Makefile.am b/files/nftables/Makefile.am
index f18156d8..a93b7978 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
index 2585d154..9e46b15a 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 {