mirror of
https://gitlab.com/shorewall/code.git
synced 2024-12-21 22:01:57 +01:00
Make handling of remote configuration data consistent.
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
parent
b0c07aa6d6
commit
29a820b2f2
@ -1310,6 +1310,8 @@ reload_command() # $* = original arguments less the command.
|
||||
libexec=/usr/share
|
||||
local confdir
|
||||
confdir=/etc
|
||||
local sbindir
|
||||
sbindir=/sbin
|
||||
|
||||
litedir=/var/lib/${g_program}-lite
|
||||
|
||||
@ -1385,11 +1387,7 @@ reload_command() # $* = original arguments less the command.
|
||||
|
||||
temp=$(rsh_command ${g_program}-lite show config 2> /dev/null | grep ^SBINDIR | sed 's/SBINDIR is //')
|
||||
|
||||
if [ -n "$temp" ]; then
|
||||
sbindir="$temp"
|
||||
else
|
||||
sbindir=/sbin
|
||||
fi
|
||||
[ -n "$temp" ] && sbindir="$temp"
|
||||
|
||||
temp=$(rsh_command ${g_program}-lite show config 2> /dev/null | grep ^CONFDIR | sed 's/CONFDIR is //')
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user