From 14f268f1254537810e406a929325fef6c7a8ed51 Mon Sep 17 00:00:00 2001 From: Phil Sutter Date: Wed, 26 Jun 2019 15:15:06 +0200 Subject: Drop ebtables-config from repository This config was used by sysv init script, so is a leftover. Fixes: b43f3ff0a6180 ("ebtables: drop sysvinit script") Signed-off-by: Phil Sutter Signed-off-by: Pablo Neira Ayuso --- .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 9940c85..19ee962 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 904de12..b879941 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 3a89902..0000000 --- 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" -- cgit v1.2.3