From 4865e2c3af268c2cc1dbebef4f4b391b8797b8b0 Mon Sep 17 00:00:00 2001 From: Tom Eastep Date: Fri, 15 Feb 2013 06:46:14 -0800 Subject: [PATCH] Save/use local SHAREDIR in reload_command - Remove SHAREDIR may differ from the local one Signed-off-by: Tom Eastep --- Shorewall/lib.cli-std | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Shorewall/lib.cli-std b/Shorewall/lib.cli-std index 983ba9432..797f11a32 100644 --- a/Shorewall/lib.cli-std +++ b/Shorewall/lib.cli-std @@ -1371,6 +1371,8 @@ reload_command() # $* = original arguments less the command. confdir=${CONFDIR} local sbindir sbindir=${SBINDIR} + local sharedir + sharedir=${SHAREDIR} litedir=${VARLIB}/${g_program}-lite @@ -1436,7 +1438,7 @@ reload_command() # $* = original arguments less the command. sbindir="$SBINDIR" confdir="$CONFDIR" libexec="$LIBEXECDIR" - . $SHAREDIR/shorewall/shorewallrc + . $sharedir/shorewall/shorewallrc else error_message " WARNING: $g_directory/shorewallrc does not exist; using settings from $SHAREDIR/shorewall" >&2 fi