From 12c8f41a0791a517d5cc7cd30bd566896891f092 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Sat, 22 Jun 2019 14:16:07 +0000 Subject: [PATCH] firewall: Drop firewall-config command in favour of "firewall settings" Signed-off-by: Michael Tremer --- Makefile.am | 1 - src/firewall | 5 +++++ src/firewall-config | 29 ----------------------------- 3 files changed, 5 insertions(+), 30 deletions(-) delete mode 100644 src/firewall-config diff --git a/Makefile.am b/Makefile.am index 0974ba87..4fe50681 100644 --- a/Makefile.am +++ b/Makefile.am @@ -114,7 +114,6 @@ dist_doc_DATA = \ dist_sbin_SCRIPTS = \ src/dhclient-script \ - src/firewall-config \ src/firewall \ src/network diff --git a/src/firewall b/src/firewall index c47ac611..569f4139 100644 --- a/src/firewall +++ b/src/firewall @@ -45,6 +45,11 @@ case "${action}" in exit $? ;; + settings) + firewall_cli_settings "$@" + exit $? + ;; + *) firewall_cli "ipv6" "${action}" "$@" ;; diff --git a/src/firewall-config b/src/firewall-config deleted file mode 100644 index 53ec1754..00000000 --- a/src/firewall-config +++ /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_settings "$@" - -exit ${EXIT_ERROR} -- 2.39.2