firewall: Drop separate scripts for IPv6 and IPv4

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/Makefile.am b/Makefile.am
index 4c26a9d472612a6d92ebff26a2120fb2dbcb35a5..a36a4ab98fd09128814a64cd18c32491968093b1 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -115,8 +115,7 @@ dist_doc_DATA = \
 dist_sbin_SCRIPTS = \
        src/dhclient-script \
        src/firewall-config \
-       src/firewall4 \
-       src/firewall6 \
+       src/firewall \
        src/network
 
 network_DATA = \

diff --git a/src/firewall6 b/src/firewall
similarity index 100%
rename from src/firewall6
rename to src/firewall

diff --git a/src/firewall4 b/src/firewall4
deleted file mode 100644 (file)
index 55eed2c..0000000
--- a/src/firewall4
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/bash
-###############################################################################
-#                                                                             #
-# IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2012  IPFire Network Development Team                         #
-#                                                                             #
-# This program is free software: you can redistribute it and/or modify        #
-# it under the terms of the GNU General Public License as published by        #
-# the Free Software Foundation, either version 3 of the License, or           #
-# (at your option) any later version.                                         #
-#                                                                             #
-# This program is distributed in the hope that it will be useful,             #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
-# GNU General Public License for more details.                                #
-#                                                                             #
-# You should have received a copy of the GNU General Public License           #
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
-#                                                                             #
-###############################################################################
-
-. /usr/lib/network/functions
-
-# Read firewall settings
-firewall_settings_read
-
-firewall_cli "ipv4" "$@"
-
-exit ${EXIT_ERROR}