firewall: Drop firewall-config command in favour of "firewall settings"

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

diff --git a/Makefile.am b/Makefile.am
index 0974ba873c3f0f04cc52b457f95574af7182b755..4fe506818c87cee9ad6cd0eb88fcb361e3a0bd5f 100644 (file)
--- 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 c47ac6116a6d83678a21fc169c3628e554e29686..569f41396d4f7d0474c6f0fb0fff8dff96ff2c60 100644 (file)
--- 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 (file)
index 53ec175..0000000
--- 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 <http://www.gnu.org/licenses/>.       #
-#                                                                             #
-###############################################################################
-
-. /usr/lib/network/functions
-
-# Read firewall settings
-firewall_settings_read
-
-firewall_cli_settings "$@"
-
-exit ${EXIT_ERROR}