Merge branch '5.1.11'

# Conflicts:
#	Shorewall/lib.cli-std
This commit is contained in:
Tom Eastep 2018-01-18 13:40:37 -08:00
commit 23d498146b
No known key found for this signature in database
GPG Key ID: 96E6B3F2423A4D10

View File

@ -396,7 +396,7 @@ uptodate() {
for dir in $g_shorewalldir $(split $CONFIG_PATH); do
if [ -n "${busybox}" ]; then
#
# Busybox 'find' doesn't support -quiet.
# Busybox 'find' doesn't support -quit.
#
if [ -n "$(${find} ${dir} -maxdepth 1 -type f -newer $1 -print)" ]; then
return 1;