From 19b14da45fb83638878b14e77303194733679bc1 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Sat, 22 Jun 2019 13:52:09 +0000 Subject: [PATCH] firewall: Drop initialisation helper script Signed-off-by: Michael Tremer --- Makefile.am | 1 - src/helpers/firewall-kernel-init | 30 ---------------------------- src/systemd/firewall-init.service.in | 4 ++-- 3 files changed, 2 insertions(+), 33 deletions(-) delete mode 100644 src/helpers/firewall-kernel-init diff --git a/Makefile.am b/Makefile.am index 81cf50d1..0974ba87 100644 --- 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 index aea82c41..00000000 --- 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 . # -# # -############################################################################### - -. /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 24497e93..91dd0586 100644 --- 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 -- 2.39.5