Yes sorry Tom, with more sleep it's obvious that the else clause is
part of the if 'defined $vendor' statement!!!:)
What I was trying to do was actually:
If both configure scripts are invoke as
./configure[.pl] host=debian.sysvinit/debian.systemd
the HOST variable will be set as:
HOST=debian.systemd/debian.sysvinit
So in both scripts I have added an elseif clause that will set
vendor and host to debian(patches attached).
if the '()' are not used the else clause of the if statement is
always executed!
configure.pl -- My patch was made on top of yours!
-Matt
On 11 Dec 2015 at 14:01, Tom Eastep wrote:
> Hi Matt,
>
> On 12/11/2015 11:21 AM, matt darfeuille wrote:
> > Thanks for the release Tom,
> >
> > I forgot one thing though(sorry):
> >
> > Configure.pl script:
> >
> > In the unless ( -f $rcfilename ) { on line 101:
> > The else clause was not including the if statement; simply moved the
> > } to the end of that if statement.
> >
>
> I don't believe that part of your patch is correct.
>
> > --
> > The line 'if ( readlink '/sbin/init') ...'
> > was missing the (); change to:
> > if ( readlink('/sbin/init') =~ ...
>
> That isn't necessary but does improve readability.
>
> >
> > --
> > Also in that if statement the 'shorewallrc' was missing from the
> > value of the variable rcfilename; changed to:
> > $rcfilename='shorewallrc.debian.systemd'
>
> Yep.
>
> Attached, please find my patch.
>
> -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 \________________________________________________
>
-------------- Enclosure number 1 ----------------
* This message contains the file 'configure-4.6.13.3.tar.bz2', which has been
* uuencoded. If you are using Pegasus Mail, then you can use
* the browser's eXtract function to lift the original contents
* out to a file, otherwise you will have to extract the message
* and uudecode it manually.
begin 660 configure-4.6.13.3.tar.bz2
M0EIH.3%!629368U8&'L``:?_ANRP`$!4[__[2^>>"O_G_WX``("```A``CMG
M,;3G<))(*>"3:-(R!HR-`#!#0`:'J:!IH,DT3$TTIH]3U/4:`````T`:```V
MI)-&DTS0TU&FF(T&3"`T,F$R&U`&()(E)IX$C1IID&309---`&(R:`:`:$AF
M4%2-5GS:@'Y@($_8:NIDY%8H5Y:4`4QD)!"&$!.KL[D4_2)L8?C"JMS=EWXV
MH0>*%$S2`+2/8L$.1RG?2X=GO7Z8/E,Y4+9OX9W%DDXJY@!J"T,L,E0O1-SX
M&:M&HU9^(OJ[3M$V(?:U''!)8MD^!R'F6X0FD]<9+;8)XR5AB`F"OKLU4/TT
M*`6`>),8H6%%PJ_?7'>DED<J!$OBO2."6DX!O,A3AIN"Q7.^X@K`VH`@@(8)
MP0WGE)`9--#``M)6!12,A+J'NJ(<$`NSP(%8L89&MCT+CC10V6-:U[A,HQ1>
M<]LC'%5Z@03F2<V0DU6K@%9C%I?8+)4ALI5,*0,(@.%5,'M#\I)-#)EE@F*L
M4,M3>M4E=*\X:;F!\N&0G.3*>AB.@\B4\SP(_((9B%Z`>H>A3,`QF.290JAW
M`=:^A9#&`\FAT=.9Y/_AY%VVS-MPNQUDB>>BL\+N`;0XR9I58,Q_)#R:KV5$
M6""*JD^>[)>)*0ZYG`JT2-X%!"BBGB5!/*A"JJWW&Q,I$F9F43"<"<$2^=QQ
M'&Y@I(B!955FHH\'#_*6MK+=A)(:1.!,E3!YY<QK'V:0OG'?$U@5@4!H-"7X
I*C#&88)E@N)_C:;"!;K?T935IPGF!S\>U='>2L(#_%W)%.%"0C5@8>QH
`
end
------------------------------------------------------------------------------
_______________________________________________
Shorewall-users mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/shorewall-users
