From 210f56c54e892d727aa381b4ffed0afb24171595 Mon Sep 17 00:00:00 2001 From: Tom Eastep Date: Tue, 5 Jul 2011 09:56:47 -0700 Subject: [PATCH] Make load and reload use the .conf file in the CWD Signed-off-by: Tom Eastep --- Shorewall/shorewall | 13 +++++++++---- Shorewall6/shorewall6 | 13 +++++++++---- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/Shorewall/shorewall b/Shorewall/shorewall index ebc7c298b..cf5fbe5c8 100755 --- a/Shorewall/shorewall +++ b/Shorewall/shorewall @@ -1278,12 +1278,17 @@ reload_command() # $* = original arguments less the command. [ -f $capabilities ] || getcaps=Yes fi - if [ -n "$getcaps" ]; then - if [ -f $directory/shorewall.conf ]; then - . $directory/shorewall.conf - ensure_config_path + if [ -f $directory/shorewall.conf ]; then + if [ -f $directory/params ]; then + . $directory/params fi + . $directory/shorewall.conf + + ensure_config_path + fi + + if [ -n "$getcaps" ]; then [ -n "$DONT_LOAD" ] && DONT_LOAD="$(echo $DONT_LOAD | tr ',' ' ')" progress_message "Getting Capabilities on system $system..." diff --git a/Shorewall6/shorewall6 b/Shorewall6/shorewall6 index 71d2f444c..ff03112d0 100755 --- a/Shorewall6/shorewall6 +++ b/Shorewall6/shorewall6 @@ -1279,12 +1279,17 @@ reload_command() # $* = original arguments less the command. [ -f $capabilities ] || getcaps=Yes fi - if [ -n "$getcaps" ]; then - if [ -f $directory/shorewall6.conf ]; then - . $directory/shorewall6.conf - ensure_config_path + if [ -f $directory/shorewall6.conf ]; then + if [ -f $directory/params ]; then + . $directory/params fi + . $directory/shorewall6.conf + + ensure_config_path + fi + + if [ -n "$getcaps" ]; then [ -n "$DONT_LOAD" ] && DONT_LOAD="$(echo $DONT_LOAD | tr ',' ' ')" progress_message "Getting Capabilities on system $system..."