extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2024-12-22 06:10:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Make handling of remote configuration data consistent.

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2012-04-04 11:47:45 -07:00
parent b0c07aa6d6
commit 29a820b2f2
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Shorewall/lib.cli-std
View File

@ -1310,6 +1310,8 @@ reload_command() # $* = original arguments less the command.
libexec=/usr/share libexec=/usr/share
local confdir local confdir
confdir=/etc confdir=/etc
local sbindir
sbindir=/sbin
litedir=/var/lib/${g_program}-lite 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 //') temp=$(rsh_command ${g_program}-lite show config 2> /dev/null | grep ^SBINDIR | sed 's/SBINDIR is //')
if [ -n "$temp" ]; then [ -n "$temp" ] && sbindir="$temp"
sbindir="$temp"
else
sbindir=/sbin
fi
temp=$(rsh_command ${g_program}-lite show config 2> /dev/null | grep ^CONFDIR | sed 's/CONFDIR is //') temp=$(rsh_command ${g_program}-lite show config 2> /dev/null | grep ^CONFDIR | sed 's/CONFDIR is //')