From patchwork Wed Jun 26 13:15:06 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Phil Sutter X-Patchwork-Id: 1122792 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=nwl.cc Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 45Yk660F8kz9s4V for ; Wed, 26 Jun 2019 23:15:10 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726242AbfFZNPI (ORCPT ); Wed, 26 Jun 2019 09:15:08 -0400 Received: from orbyte.nwl.cc ([151.80.46.58]:56178 "EHLO orbyte.nwl.cc" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726104AbfFZNPI (ORCPT ); Wed, 26 Jun 2019 09:15:08 -0400 Received: from localhost ([::1]:41036 helo=tatos) by orbyte.nwl.cc with esmtp (Exim 4.91) (envelope-from ) id 1hg7lT-0006ir-5P; Wed, 26 Jun 2019 15:15:07 +0200 From: Phil Sutter To: Pablo Neira Ayuso Cc: netfilter-devel@vger.kernel.org Subject: [ebtables PATCH] Drop ebtables-config from repository Date: Wed, 26 Jun 2019 15:15:06 +0200 Message-Id: <20190626131506.30198-1-phil@nwl.cc> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org This config was used by sysv init script, so is a leftover. Fixes: b43f3ff0a6180 ("ebtables: drop sysvinit script") Signed-off-by: Phil Sutter --- .gitignore | 1 - Makefile.am | 5 +---- ebtables-config.in | 37 ------------------------------------- 3 files changed, 1 insertion(+), 42 deletions(-) delete mode 100644 ebtables-config.in diff --git a/.gitignore b/.gitignore index 9940c85762fa0..19ee9627b0c8e 100644 --- a/.gitignore +++ b/.gitignore @@ -18,7 +18,6 @@ Makefile.in /stamp-h1 /ebtables-legacy -/ebtables-config /ebtables-legacy-restore /ebtables-legacy-save /ebtables-legacy.8 diff --git a/Makefile.am b/Makefile.am index 904de12773a84..b879941cfdd50 100644 --- a/Makefile.am +++ b/Makefile.am @@ -58,14 +58,11 @@ examples_ulog_test_ulog_SOURCES = examples/ulog/test_ulog.c getethertype.c daemon: ebtablesd ebtablesu exec: ebtables-legacy ebtables-legacy-restore -CLEANFILES = ebtables-legacy-save ebtables-config ebtables-legacy.8 +CLEANFILES = ebtables-legacy-save ebtables-legacy.8 ebtables-legacy-save: ebtables-save.in ${top_builddir}/config.status ${AM_V_GEN}sed -e 's![@]sbindir@!${sbindir}!g' <$< >$@ -ebtables-config: ebtables-config.in ${top_builddir}/config.status - ${AM_V_GEN}sed -e 's![@]sysconfigdir@!${sysconfigdir}!g' <$< >$@ - ebtables-legacy.8: ebtables-legacy.8.in ${top_builddir}/config.status ${AM_V_GEN}sed -e 's![@]PACKAGE_VERSION!${PACKAGE_VERSION}!g' \ -e 's![@]PACKAGE_DATE@!${PROGDATE}!g' \ diff --git a/ebtables-config.in b/ebtables-config.in deleted file mode 100644 index 3a8990260a9c4..0000000000000 --- a/ebtables-config.in +++ /dev/null @@ -1,37 +0,0 @@ -# Save (and possibly restore) in text format. -# Value: yes|no, default: yes -# Save the firewall rules in text format to __SYSCONFIG__/ebtables -# If EBTABLES_BINARY_FORMAT="no" then restoring the firewall rules -# is done using this text format. -EBTABLES_TEXT_FORMAT="yes" - -# Save (and restore) in binary format. -# Value: yes|no, default: yes -# Save (and restore) the firewall rules in binary format to (and from) -# __SYSCONFIG__/ebtables.. Enabling this option will make -# firewall initialisation a lot faster. -EBTABLES_BINARY_FORMAT="yes" - -# Unload modules on restart and stop -# Value: yes|no, default: yes -# This option has to be 'yes' to get to a sane state for a firewall -# restart or stop. Only set to 'no' if there are problems unloading netfilter -# modules. -EBTABLES_MODULES_UNLOAD="yes" - -# Save current firewall rules on stop. -# Value: yes|no, default: no -# Saves all firewall rules if firewall gets stopped -# (e.g. on system shutdown). -EBTABLES_SAVE_ON_STOP="no" - -# Save current firewall rules on restart. -# Value: yes|no, default: no -# Saves all firewall rules if firewall gets restarted. -EBTABLES_SAVE_ON_RESTART="no" - -# Save (and restore) rule counters. -# Value: yes|no, default: no -# Save rule counters when saving a kernel table to a file. If the -# rule counters were saved, they will be restored when restoring the table. -EBTABLES_SAVE_COUNTER="no"