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

Save/use local SHAREDIR in reload_command

Browse Source 
- Remove SHAREDIR may differ from the local one

Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2013-02-15 06:46:14 -08:00
parent 4b01b42c34
commit 4865e2c3af
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Shorewall/lib.cli-std
View File

@ -1371,6 +1371,8 @@ reload_command() # $* = original arguments less the command.
confdir=${CONFDIR} confdir=${CONFDIR}
local sbindir local sbindir
sbindir=${SBINDIR} sbindir=${SBINDIR}
local sharedir
sharedir=${SHAREDIR}
litedir=${VARLIB}/${g_program}-lite litedir=${VARLIB}/${g_program}-lite
@ -1436,7 +1438,7 @@ reload_command() # $* = original arguments less the command.
sbindir="$SBINDIR" sbindir="$SBINDIR"
confdir="$CONFDIR" confdir="$CONFDIR"
libexec="$LIBEXECDIR" libexec="$LIBEXECDIR"
. $SHAREDIR/shorewall/shorewallrc . $sharedir/shorewall/shorewallrc
else else
error_message " WARNING: $g_directory/shorewallrc does not exist; using settings from $SHAREDIR/shorewall" >&2 error_message " WARNING: $g_directory/shorewallrc does not exist; using settings from $SHAREDIR/shorewall" >&2
fi fi