From b43f3ff0a61804f95e6cb3f1dee02f1de1a3a699 Mon Sep 17 00:00:00 2001
From: Arturo Borrero Gonzalez <arturo@netfilter.org>
Date: Tue, 22 Jan 2019 18:41:52 +0100
Subject: ebtables: drop sysvinit script

This configuration file belongs to downstream distributions.
Also, it's unmaintained.

Signed-off-by: Arturo Borrero Gonzalez <arturo@netfilter.org>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
 .gitignore       |   1 -
 Makefile.am      |   5 +-
 ebtables.sysv.in | 145 -------------------------------------------------------
 3 files changed, 1 insertion(+), 150 deletions(-)
 delete mode 100644 ebtables.sysv.in

diff --git a/.gitignore b/.gitignore
index 1fff83c..c1fae54 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,7 +22,6 @@ Makefile.in
 /ebtables-restore
 /ebtables-save
 /ebtables.8
-/ebtables.sysv
 /ebtablesd
 /ebtablesu
 /static
diff --git a/Makefile.am b/Makefile.am
index b16a4d6..59ae595 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -60,14 +60,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.sysv ebtables-config ebtables-legacy.8
+CLEANFILES = ebtables-legacy-save ebtables-config ebtables-legacy.8
 
 ebtables-legacy-save: ebtables-save.in ${top_builddir}/config.status
 	${AM_V_GEN}sed -e 's![@]sbindir@!${sbindir}!g' <$< >$@
 
-ebtables.sysv: ebtables.sysv.in ${top_builddir}/config.status
-	${AM_V_GEN}sed -e 's![@]sbindir@!${sbindir}!g' -e 's![@]sysconfigdir@!${sysconfigdir}!g' <$< >$@
-
 ebtables-config: ebtables-config.in ${top_builddir}/config.status
 	${AM_V_GEN}sed -e 's![@]sysconfigdir@!${sysconfigdir}!g' <$< >$@
 
diff --git a/ebtables.sysv.in b/ebtables.sysv.in
deleted file mode 100644
index bbf0e74..0000000
--- a/ebtables.sysv.in
+++ /dev/null
@@ -1,145 +0,0 @@
-#!/bin/bash
-#
-# init script for the Ethernet Bridge filter tables
-#
-# Written by Dag Wieers <dag@wieers.com>
-# Modified by Rok Papez <rok.papez@arnes.si>
-#             Bart De Schuymer <bdschuym@pandora.be>
-#
-# chkconfig: - 15 85
-# description: Ethernet Bridge filtering tables
-#
-# config: @sysconfigdir@/ebtables         (text)
-#         @sysconfigdir@/ebtables.<table> (binary)
-
-source /etc/init.d/functions
-source /etc/sysconfig/network
-
-# Check that networking is up.
-[ ${NETWORKING} = "no" ] && exit 0
-
-[ -x @sbindir@/ebtables ] || exit 1
-[ -x @sbindir@/ebtables-save ] || exit 1
-[ -x @sbindir@/ebtables-restore ] || exit 1
-
-RETVAL=0
-prog="ebtables"
-desc="Ethernet bridge filtering"
-umask 0077
-
-#default configuration
-EBTABLES_TEXT_FORMAT="yes"
-EBTABLES_BINARY_FORMAT="yes"
-EBTABLES_MODULES_UNLOAD="yes"
-EBTABLES_SAVE_ON_STOP="no"
-EBTABLES_SAVE_ON_RESTART="no"
-EBTABLES_SAVE_COUNTER="no"
-
-config=@sysconfigdir@/$prog-config
-[ -f "$config" ] && . "$config"
-
-start() {
-	echo -n $"Starting $desc ($prog): "
-	if [ "$EBTABLES_BINARY_FORMAT" = "yes" ]; then
-		for table in $(ls @sysconfigdir@/ebtables.* 2>/dev/null | sed -e 's/.*ebtables\.//' -e '/save/d' ); do
-			@sbindir@/ebtables -t $table --atomic-file @sysconfigdir@/ebtables.$table --atomic-commit || RETVAL=1
-		done
-	else
-		@sbindir@/ebtables-restore < /etc/sysconfig/ebtables || RETVAL=1
-	fi
-
-	if [ $RETVAL -eq 0 ]; then
-		success "$prog startup"
-		rm -f /var/lock/subsys/$prog
-	else
-		failure "$prog startup"
-	fi
-	echo
-}
-
-stop() {
-	echo -n $"Stopping $desc ($prog): "
-	for table in $(grep '^ebtable_' /proc/modules | sed -e 's/ebtable_\([^ ]*\).*/\1/'); do
-		@sbindir@/ebtables -t $table --init-table || RETVAL=1
-	done
-
-	if [ "$EBTABLES_MODULES_UNLOAD" = "yes" ]; then
-		for mod in $(grep -E '^(ebt|ebtable)_' /proc/modules | cut -f1 -d' ') ebtables; do
-			rmmod $mod 2> /dev/null
-		done
-	fi
-
-	if [ $RETVAL -eq 0 ]; then
-		success "$prog shutdown"
-		rm -f /var/lock/subsys/$prog
-	else
-		failure "$prog shutdown"
-	fi
-	echo
-}
-
-restart() {
-	stop
-	start
-}
-
-save() {
-	echo -n $"Saving $desc ($prog): "
-	if [ "$EBTABLES_TEXT_FORMAT" = "yes" ]; then
-		if [ -e @sysconfigdir@/ebtables ]; then
-			chmod 0600 @sysconfigdir@/ebtables
-			mv -f @sysconfigdir@/ebtables @sysconfigdir@/ebtables.save
-		fi
-		@sbindir@/ebtables-save > @sysconfigdir@/ebtables || RETVAL=1
-	fi
-	if [ "$EBTABLES_BINARY_FORMAT" = "yes" ]; then
-		rm -f @sysconfigdir@/ebtables.*.save
-		for oldtable in $(ls @sysconfigdir@/ebtables.* 2>/dev/null | grep -vF 'ebtables.save'); do
-			chmod 0600 $oldtable
-			mv -f $oldtable $oldtable.save
-		done
-		for table in $(grep '^ebtable_' /proc/modules | sed -e 's/ebtable_\([^ ]*\).*/\1/'); do
-			@sbindir@/ebtables -t $table --atomic-file @sysconfigdir@/ebtables.$table --atomic-save || RETVAL=1
-			if [ "$EBTABLES_SAVE_COUNTER" = "no" ]; then
-				@sbindir@/ebtables -t $table --atomic-file @sysconfigdir@/ebtables.$table -Z || RETVAL=1
-			fi
-		done
-	fi
-
-	if [ $RETVAL -eq 0 ]; then
-		success "$prog saved"
-	else
-		failure "$prog saved"
-	fi
-	echo
-}
-
-case "$1" in
-  start)
-	start
-	;;
-  stop)
-	[ "$EBTABLES_SAVE_ON_STOP" = "yes" ] && save
-	stop
-	;;
-  restart|reload)
-	[ "$EBTABLES_SAVE_ON_RESTART" = "yes" ] && save
-	restart
-	;;
-  condrestart)
-	[ -e /var/lock/subsys/$prog ] && restart
-	RETVAL=$?
-	;;
-  save)
-	save
-	;;
-  status)
-	@sbindir@/ebtables-save
-	RETVAL=$?
-	;;
-  *)
-	echo $"Usage $0 {start|stop|restart|condrestart|save|status}"
-	RETVAL=1
-esac
-
-exit $RETVAL
-- 
cgit v1.2.3