BUG10620: reload firewall.local in rules.pl, no longer in initscript

diff --git a/config/firewall/rules.pl b/config/firewall/rules.pl
index aa8870cdc488a47b123d0d794689573ec2f5b2d4..b6b6b1cbfb80117e744fe509bafb898b982707be 100755 (executable)
--- 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 c7f8b679d617b875a49f724f304b7dbe30336360..66ca432a26d607b1eb8afdcdf17be4c61370dad9 100644 (file)
--- 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
        ;;
   *)