From patchwork Mon Mar 12 11:36:04 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Westphal X-Patchwork-Id: 884462 X-Patchwork-Delegate: pablo@netfilter.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netfilter-devel-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=strlen.de Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 400GLh1DMSz9sSV for ; Mon, 12 Mar 2018 22:42:36 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751323AbeCLLmd (ORCPT ); Mon, 12 Mar 2018 07:42:33 -0400 Received: from Chamillionaire.breakpoint.cc ([146.0.238.67]:34402 "EHLO Chamillionaire.breakpoint.cc" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751104AbeCLLmb (ORCPT ); Mon, 12 Mar 2018 07:42:31 -0400 Received: from fw by Chamillionaire.breakpoint.cc with local (Exim 4.84_2) (envelope-from ) id 1evLqY-0002Zy-18; Mon, 12 Mar 2018 12:42:30 +0100 From: Florian Westphal To: Cc: Florian Westphal , Arturo Borrero Gonzalez Subject: [PATCH nft] src: install table skeleton files to sysconfdir/nftables Date: Mon, 12 Mar 2018 12:36:04 +0100 Message-Id: <20180312113604.31602-1-fw@strlen.de> X-Mailer: git-send-email 2.16.1 Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org commit 6c9230e79339ca ("nftables: rearrange files and examples") removed the install hook for the old 'iptables table skeleton rulesets'. This restores the install hook for some of these. Reported-by: Duncan Roe Cc: Arturo Borrero Gonzalez Signed-off-by: Florian Westphal --- Makefile.am | 1 + configure.ac | 2 ++ files/Makefile.am | 1 + files/examples/Makefile.am | 18 ++++++++++++++++++ 4 files changed, 22 insertions(+) create mode 100644 files/Makefile.am create mode 100644 files/examples/Makefile.am diff --git a/Makefile.am b/Makefile.am index 5ef61be6dfec..f33da9dbd181 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,6 +2,7 @@ ACLOCAL_AMFLAGS = -I m4 SUBDIRS = src \ include \ + files \ doc EXTRA_DIST = tests \ diff --git a/configure.ac b/configure.ac index 6c6b9b3a4c4b..fb2175a55656 100644 --- a/configure.ac +++ b/configure.ac @@ -119,6 +119,8 @@ AC_CONFIG_FILES([ \ include/linux/netfilter_ipv4/Makefile \ include/linux/netfilter_ipv6/Makefile \ doc/Makefile \ + files/Makefile \ + files/examples/Makefile \ ]) AC_OUTPUT diff --git a/files/Makefile.am b/files/Makefile.am new file mode 100644 index 000000000000..aee2d7baa2ad --- /dev/null +++ b/files/Makefile.am @@ -0,0 +1 @@ +SUBDIRS = examples diff --git a/files/examples/Makefile.am b/files/examples/Makefile.am new file mode 100644 index 000000000000..21e8be1bd388 --- /dev/null +++ b/files/examples/Makefile.am @@ -0,0 +1,18 @@ + +pkgsysconfdir = ${sysconfdir}/nftables +dist_pkgsysconf_DATA = arp-filter.nft \ + bridge-filter.nft \ + inet-filter.nft \ + ipv4-filter.nft \ + ipv4-mangle.nft \ + ipv4-nat.nft \ + ipv4-raw.nft \ + ipv6-filter.nft \ + ipv6-mangle.nft \ + ipv6-nat.nft \ + ipv6-raw.nft \ + netdev-ingress.nft + + +install-data-hook: + ${SED} -i 's|@sbindir[@]|${sbindir}/|g' ${DESTDIR}${pkgsysconfdir}/*