mirror of
https://gitlab.com/shorewall/code.git
synced 2025-01-03 03:59:16 +01:00
Save/use local SHAREDIR in reload_command
- Remove SHAREDIR may differ from the local one Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
parent
7859267539
commit
ab4dd54523
@ -1378,6 +1378,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
|
||||||
|
|
||||||
@ -1443,7 +1445,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
|
||||||
|
Loading…
Reference in New Issue
Block a user