On 07/28/2018 08:40 AM, Matt Darfeuille wrote: > On 7/28/2018 5:19 PM, Tom Eastep wrote: >> On 07/28/2018 08:16 AM, Brian J. Murrell wrote: >>> On Sat, 2018-07-28 at 08:03 -0700, Tom Eastep wrote: >>>> diff --git a/Shorewall-core/lib.common b/Shorewall-core/lib.common >>>> index 205fc705f..bbebf0936 100644 >>>> --- a/Shorewall-core/lib.common >>>> +++ b/Shorewall-core/lib.common >>>> @@ -751,6 +751,8 @@ mutex_on() >>>> lockf=${LOCKFILE:=${VARDIR}/lock} >>>> local lockpid >>>> local lockd >>>> + local lockbin >>>> + local openwrt >>>> >>>> MUTEX_TIMEOUT=${MUTEX_TIMEOUT:-60} >>>> >>>> @@ -760,28 +762,33 @@ mutex_on() >>>> >>>> [ -d "$lockd" ] || mkdir -p "$lockd" >>>> >>>> + lockbin=$(qt mywhich lock) >>>> + openwrt=[ -n "$openwrt" -a -h "$openwrt" ] >>> >>> Did you mean: >>> >>> + openwrt=[ -n "$lockbin" -a -h "$lockbin" ] >>> >>> here? >>> >> >> Yes. >> > > Tom, would you mind pushing the master branch of the trunk (code) repo? >
This last change is not committed yet, and I don't want to push until Brian is happy with the result. -Tom -- Tom Eastep \ Q: What do you get when you cross a mobster with Shoreline, \ an international standard? Washington, USA \ A: Someone who makes you an offer you can't http://shorewall.org \ understand \_______________________________________________
signature.asc
Description: OpenPGP digital signature
------------------------------------------------------------------------------ Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________ Shorewall-users mailing list Shorewall-users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/shorewall-users