On 12/12/2015 05:06 AM, matt darfeuille wrote: > 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). >
Thanks, Matt. I did it slightly differently - see attached. -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 b/Shorewall-core/configure
index 470672e..adb4f1b 100755
--- a/Shorewall-core/configure
+++ b/Shorewall-core/configure
@@ -169,6 +169,9 @@ else
elif [ $vendor = default ]; then
params[HOST]=linux
vendor=linux
+ elif [[ $vendor == debian.* ]]; then
+ params[HOST]=debian
+ vendor=debian
fi
fi
diff --git a/Shorewall-core/configure.pl b/Shorewall-core/configure.pl
index 0e4d660..387d07b 100755
--- a/Shorewall-core/configure.pl
+++ b/Shorewall-core/configure.pl
@@ -102,6 +102,8 @@ if ( defined $vendor ) {
die qq("ERROR: $vendor" is not a recognized host type);
} elsif ( $vendor eq 'default' ) {
$params{HOST} = $vendor = 'linux';
+ } elsif ( $vendor =~ /^debian\./ ) {
+ $params{HOST} = $vendor = 'debian';
}
} else {
if ( -f '/etc/debian_version' ) {
signature.asc
Description: OpenPGP digital signature
------------------------------------------------------------------------------
_______________________________________________ Shorewall-users mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/shorewall-users
