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 \________________________________________________
diff --git a/Shorewall-core/configure.pl b/Shorewall-core/configure.pl
index 6dbb8f7..9bfd78f 100755
--- a/Shorewall-core/configure.pl
+++ b/Shorewall-core/configure.pl
@@ -107,10 +107,10 @@ if ( defined $vendor ) {
if ( -f '/etc/debian_version' ) {
$vendor = 'debian';
if ( -l '/sbin/init' ) {
- if ( readlink '/sbin/init' =~ /systemd/ ) {
- $rcfilename = 'debian.systemd';
+ if ( readlink( '/sbin/init' ) =~ /systemd/ ) {
+ $rcfilename = 'shorewallrc.debian.systemd';
} else {
- $rcfilename = 'shorewallrc.debian.sysvinit';
+ $rcfilename = 'shorewallrc.debian.sysvinit';
}
} else {
$rcfilename = 'shorewallrc.debian.sysvinit';
------------------------------------------------------------------------------
_______________________________________________
Shorewall-users mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/shorewall-users
