On 05/29/2016 02:00 AM, Matt Darfeuille wrote: > > Tom, attached as code.patch, are the patches that I believe will > correct those issues > > In addition to those patches I've also added 3 patches: > - Patch 1 will emulate the -p flag of the ps utility which is not > available on openwrt. > - The last two patches will add "file" to the progress message of > SYSCONFFILE to make it more consistent among the installers. > > > In shorewall-init/install.sh the else clause between the line 586 > and 597 will only work for a sysvinit script. > Should I make it also work for a systemd service script or can't we > simply remove that else clause? > > > In the compiled firewall script the comments before and after the > functions imported from lib.common have two slashes in the path: > $ grep -H lib.common firewall > firewall:# Functions imported from /usr/share/shorewall//lib.common > firewall:# End of imports from /usr/share/shorewall//lib.common > > -Matt > >
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 > rm -f ${lockf} > error_message "WARNING: Stale lockfile ${lockf} from pid > ${lockpid} removed" > fi > -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
