On 06/07/2016 06:40 AM, Matt Darfeuille wrote: > On 5 Jun 2016 at 12:53, Tom Eastep wrote: > >> On 06/05/2016 12:33 PM, Matt Darfeuille wrote: >>> On 5 Jun 2016 at 7:57, Tom Eastep wrote: >>> >>>> On 05/29/2016 02:00 AM, Matt Darfeuille wrote: >>>> >>>> Hi Matt, >>>> >>>>> >>>>> -------------- Enclosure number 1 ---------------- >>>>> >From 6ff651108df33ab8be4562caef03a8582e9eac5e Mon Sep 17 00:00:00 2001 >>>>> From: Matt Darfeuille <[email protected]> >>>>> Date: Tue, 24 May 2016 13:10:28 +0200 >>>>> Subject: [PATCH 1/8] Emulate 'ps -p' using grep to work on openwrt >>>>> >>>>> Signed-off-by: Matt Darfeuille <[email protected]> >>>>> --- >>>>> Shorewall-core/lib.common | 2 +- >>>>> 1 file changed, 1 insertion(+), 1 deletion(-) >>>>> >>>>> diff --git a/Shorewall-core/lib.common b/Shorewall-core/lib.common >>>>> index 03ecb2a..fcb02ee 100644 >>>>> --- a/Shorewall-core/lib.common >>>>> +++ b/Shorewall-core/lib.common >>>>> @@ -776,7 +776,7 @@ mutex_on() >>>>> error_message "WARNING: Stale lockfile ${lockf} removed" >>>>> elif [ $lockpid -eq $$ ]; then >>>>> return 0 >>>>> - elif ! qt ps p ${lockpid}; then >>>>> + elif ! qt ps | grep -v grep | grep ${lockpid}; then >>>> >>>> I don't see how this can work -- 'qt ps' will produce no output yet the >>>> code pipes into tandem greps. >>>> >>>> Do you really want this instead? >>>> >>>> elif ! ps | grep -v grep | qt grep ${lockpid}; then >>>> >>> >>> Oops sorry Tom, that's what I meant(do you want the corrected >>> patch?)! >> >> Yes, please. >> > > Tom, along with correcting this faulty commit I realize, after some > more testing, that I've also sent unnecessary commits. > > Should I revert these 3 commits(git revert ...): > Set proper permissions for the LOCKFILE on openwrt > 2ded346cb557212389212fd5adcd4c6800edbb62 > Create lockfile before using openwrt's lock utility > 08e8796ff1abc3b24b8bbd40bf5e0a2b36464d61 > Emulate 'ps -p' using grep to work on openwrt > 6ff651108df33ab8be4562caef03a8582e9eac5e > > or should I simply create new commits that will correct these faulty > commits? > > In other words what's the best way to correct submited commits. >
Matt, Either way is fine. -Tom -- Tom Eastep \ When I die, I want to go like my Grandfather who Shoreline, \ died peacefully in his sleep. Not screaming like Washington, USA \ all of the passengers in his car http://shorewall.net \________________________________________________
signature.asc
Description: OpenPGP digital signature
------------------------------------------------------------------------------ What NetFlow Analyzer can do for you? Monitors network bandwidth and traffic patterns at an interface-level. Reveals which users, apps, and protocols are consuming the most bandwidth. Provides multi-vendor support for NetFlow, J-Flow, sFlow and other flows. Make informed decisions using capacity planning reports. https://ad.doubleclick.net/ddm/clk/305295220;132659582;e
_______________________________________________ Shorewall-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/shorewall-devel
