extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2025-06-24 19:51:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

Some fixes for -lite changes

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2010-03-02 17:16:11 -08:00
parent 78a39ccad5
commit 70296b4bd6
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Shorewall-lite/shorewall-lite
View File

@ -569,7 +569,7 @@ get_config
g_firewall=$LITEDIR/firewall g_firewall=$LITEDIR/firewall
if [ -f $version_file ]; then if [ -f $version_file ]; then
SHOREWALL_VERSION=$(cat $SHOREWALL_VERSION_FILE) SHOREWALL_VERSION=$(cat $version_file)
else else
echo " ERROR: Shorewall Lite is not properly installed" >&2 echo " ERROR: Shorewall Lite is not properly installed" >&2
echo " The file $version_file does not exist" >&2 echo " The file $version_file does not exist" >&2

4
Shorewall/shorewall
View File

@ -1199,9 +1199,9 @@ reload_command() # $* = original arguments less the command.
;; ;;
esac 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 if [ -z "$getcaps" ]; then
SHOREWALL_DIR=$(resolve_file $directory) SHOREWALL_DIR=$(resolve_file $directory)

10
Shorewall6/shorewall6
View File

@ -1079,7 +1079,7 @@ reload_command() # $* = original arguments less the command.
local compiler local compiler
compiler= compiler=
LITEDIR=/var/lib/shorewall6-lite litedir=/var/lib/shorewall6-lite
while [ $finished -eq 0 -a $# -gt 0 ]; do while [ $finished -eq 0 -a $# -gt 0 ]; do
option=$1 option=$1
@ -1134,9 +1134,9 @@ reload_command() # $* = original arguments less the command.
;; ;;
esac 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 if [ -z "$getcaps" ]; then
SHOREWALL_DIR=$(resolve_file $directory) SHOREWALL_DIR=$(resolve_file $directory)
@ -1162,8 +1162,8 @@ reload_command() # $* = original arguments less the command.
[ -n "$TIMESTAMP" ] && timestamp='-t' || timestamp= [ -n "$TIMESTAMP" ] && timestamp='-t' || timestamp=
if shorewall6 $g_debugging $verbose $timestamp compile -e $compiler $directory $directory/firewall && \ if shorewall6 $g_debugging $verbose $timestamp compile -e $compiler $directory $directory/firewall && \
progress_message3 "Copying $file and ${file}.conf to ${system}:${LITEDIR}..." && \ progress_message3 "Copying $file and ${file}.conf to ${system}:${litedir}..." && \
rcp_command "$directory/firewall $directory/firewall.conf" ${LITEDIR} rcp_command "$directory/firewall $directory/firewall.conf" ${litedir}
then then
save=$(find_file save); save=$(find_file save);