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>

diff --git a/files/nftables/Makefile.am b/files/nftables/Makefile.am
index f18156d844e5c358757a2a8fd079a9bb6c3fc558..a93b7978f62d4991f0b36e3e1f9d15e1c7a339de 100644 (file)
--- 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 2585d15493885b9a02933618f90b5a58002e42e1..9e46b15a7e59606919a58b01f11e1999aa5ec959 100755 (executable)
--- 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 {