diff --git a/Shorewall-lite/shorewall-lite b/Shorewall-lite/shorewall-lite index 714159c23..6cfea4bdf 100755 --- a/Shorewall-lite/shorewall-lite +++ b/Shorewall-lite/shorewall-lite @@ -569,7 +569,7 @@ get_config g_firewall=$LITEDIR/firewall if [ -f $version_file ]; then - SHOREWALL_VERSION=$(cat $SHOREWALL_VERSION_FILE) + SHOREWALL_VERSION=$(cat $version_file) else echo " ERROR: Shorewall Lite is not properly installed" >&2 echo " The file $version_file does not exist" >&2 diff --git a/Shorewall/shorewall b/Shorewall/shorewall index b50fb330c..5244cca68 100755 --- a/Shorewall/shorewall +++ b/Shorewall/shorewall @@ -1199,9 +1199,9 @@ reload_command() # $* = original arguments less the command. ;; esac - litedir=$(rsh_command /sbin/shorewall-lite show config 2> /dev/null | grep ^litedir | sed 's/litedir is //') + temp=$(rsh_command /sbin/shorewall-lite show config 2> /dev/null | grep ^LITEDIR | sed 's/LITEDIR is //') - [ -n "$litedir" ] && litedir=$litedir + [ -n "$temp" ] && litedir="$temp" if [ -z "$getcaps" ]; then SHOREWALL_DIR=$(resolve_file $directory) diff --git a/Shorewall6/shorewall6 b/Shorewall6/shorewall6 index 973024eea..d37d27eba 100755 --- a/Shorewall6/shorewall6 +++ b/Shorewall6/shorewall6 @@ -1079,7 +1079,7 @@ reload_command() # $* = original arguments less the command. local compiler compiler= - LITEDIR=/var/lib/shorewall6-lite + litedir=/var/lib/shorewall6-lite while [ $finished -eq 0 -a $# -gt 0 ]; do option=$1 @@ -1134,9 +1134,9 @@ reload_command() # $* = original arguments less the command. ;; esac - litedir=$(rsh_command /sbin/shorewall6-lite show config 2> /dev/null | grep ^LITEDIR | sed 's/LITEDIR is //') + temp=$(rsh_command /sbin/shorewall6-lite show config 2> /dev/null | grep ^LITEDIR | sed 's/LITEDIR is //') - [ -n "$litedir" ] && LITEDIR=$litedir + [ -n "$temp" ] && litedir=$temp if [ -z "$getcaps" ]; then SHOREWALL_DIR=$(resolve_file $directory) @@ -1162,8 +1162,8 @@ reload_command() # $* = original arguments less the command. [ -n "$TIMESTAMP" ] && timestamp='-t' || timestamp= if shorewall6 $g_debugging $verbose $timestamp compile -e $compiler $directory $directory/firewall && \ - progress_message3 "Copying $file and ${file}.conf to ${system}:${LITEDIR}..." && \ - rcp_command "$directory/firewall $directory/firewall.conf" ${LITEDIR} + progress_message3 "Copying $file and ${file}.conf to ${system}:${litedir}..." && \ + rcp_command "$directory/firewall $directory/firewall.conf" ${litedir} then save=$(find_file save);