From: Michael Tremer Date: Fri, 21 Jun 2019 05:34:23 +0000 (+0100) Subject: firewall: Drop separate scripts for IPv6 and IPv4 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0c5d22de5c22c9264dcb839df72440a1d11faa0c;p=people%2Fms%2Fnetwork.git firewall: Drop separate scripts for IPv6 and IPv4 Signed-off-by: Michael Tremer --- diff --git a/Makefile.am b/Makefile.am index 4c26a9d4..a36a4ab9 100644 --- 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 index 55eed2c3..00000000 --- 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 . # -# # -############################################################################### - -. /usr/lib/network/functions - -# Read firewall settings -firewall_settings_read - -firewall_cli "ipv4" "$@" - -exit ${EXIT_ERROR}