From ca4259a75817c7568f801c6c9535a2a2a60a8850 Mon Sep 17 00:00:00 2001 From: Alexander Marx Date: Thu, 11 Sep 2014 17:13:07 +0200 Subject: [PATCH] BUG10620: reload firewall.local in rules.pl, no longer in initscript --- config/firewall/rules.pl | 4 ++++ src/initscripts/init.d/firewall | 14 -------------- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/config/firewall/rules.pl b/config/firewall/rules.pl index aa8870cdc4..b6b6b1cbfb 100755 --- a/config/firewall/rules.pl +++ b/config/firewall/rules.pl @@ -457,6 +457,10 @@ sub buildrules { } } } + #Reload firewall.local if present + if ( -f '/etc/sysconfig/firewall.local'){ + run("/etc/sysconfig/firewall.local reload"); + } } # Formats the given timestamp into the iptables format which is "hh:mm" UTC. diff --git a/src/initscripts/init.d/firewall b/src/initscripts/init.d/firewall index c7f8b679d6..66ca432a26 100644 --- a/src/initscripts/init.d/firewall +++ b/src/initscripts/init.d/firewall @@ -402,21 +402,11 @@ case "$1" in boot_mesg "Setting up firewall" iptables_init evaluate_retval - - # run local firewall configuration, if present - if [ -x /etc/sysconfig/firewall.local ]; then - /etc/sysconfig/firewall.local start - fi ;; reload|up) boot_mesg "Reloading firewall" iptables_red_up evaluate_retval - - # run local firewall configuration, if present - if [ -x /etc/sysconfig/firewall.local ]; then - /etc/sysconfig/firewall.local reload - fi ;; down) boot_mesg "Disabling firewall access to RED" @@ -424,10 +414,6 @@ case "$1" in evaluate_retval ;; restart) - # run local firewall configuration, if present - if [ -x /etc/sysconfig/firewall.local ]; then - /etc/sysconfig/firewall.local stop - fi $0 start ;; *) -- 2.39.5