firewall: Drop initialisation helper script

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

diff --git a/Makefile.am b/Makefile.am
index 81cf50d133d09bb76b8ec1172ee730836a5dfa84..0974ba873c3f0f04cc52b457f95574af7182b755 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -206,7 +206,6 @@ dist_network_SCRIPTS = \
 
 dist_helpers_SCRIPTS = \
        src/helpers/dhcpd-config-helper \
-       src/helpers/firewall-kernel-init \
        src/helpers/hostapd-config-helper \
        src/helpers/ipsec-updown \
        src/helpers/pppd-angel \

diff --git a/src/helpers/firewall-kernel-init b/src/helpers/firewall-kernel-init
deleted file mode 100644 (file)
index aea82c4..0000000
--- a/src/helpers/firewall-kernel-init
+++ /dev/null
@@ -1,30 +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_setttings_read
-
-# Initialize kernel parameters for the firewall.
-firewall_kernel_init
-
-exit ${EXIT_OK}

diff --git a/src/systemd/firewall-init.service.in b/src/systemd/firewall-init.service.in
index 24497e938e8dca1dd1868c3f9d04c3ff0cda15f5..91dd05866e8cc7ef040a5c865a275ef622ff4558 100644 (file)
--- a/src/systemd/firewall-init.service.in
+++ b/src/systemd/firewall-init.service.in
@@ -1,8 +1,8 @@
 [Unit]
-Description=Initialize kernel parameters for the firewalls
+Description=Initialize kernel parameters for the firewall
 Before=network.target
 
 [Service]
 Type=oneshot
 RemainAfterExit=yes
-ExecStart=@helpersdir@/firewall-kernel-init
+ExecStart=@sbindir@/firewall init