Don't verify IP and SHOREWALL_SHELL setting when compiling for export

Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2017-11-14 08:50:05 -08:00
parent 2a9272ccd1
commit 9d299ef866
No known key found for this signature in database
GPG Key ID: 96E6B3F2423A4D10

View File

@ -211,6 +211,7 @@ get_config() {
LOG_VERBOSITY=-1
fi
if [ -z "$g_export" -a "$(id -u)" = 0 ]; then
if [ -n "$SHOREWALL_SHELL" -a -z "$g_export" ]; then
if [ ! -x "$SHOREWALL_SHELL" ]; then
echo " WARNING: The program specified in SHOREWALL_SHELL does not exist or is not executable; falling back to /bin/sh" >&2
@ -236,6 +237,10 @@ get_config() {
else
IP='ip'
fi
else
[ -n "$SHOREWALL_SHELL" ] || SHOREWALL_SHELL=/bin/sh
[ -n "$IP" ] || IP='ip'
fi
case $VERBOSITY in
-1|0|1|2)