On 5/19/2014 1:36 PM, Orion Poplawski wrote: > On 05/19/2014 01:00 PM, Orion Poplawski wrote: >> I'm trying to build the shorewall EPEL package for RHEL7 and getting: >> > >> + ./install.sh >> ERROR: Unknown BUILD environment (rhel) > > This patch seems to fix. > > Any way to keep shorewall from installing the old SysV init scripts? >
Attached is a more complete patch. Setting the SYSTEMD variable should suppress installation of the SysV init stuff. -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 c722022..0467904 100755
--- a/Shorewall-core/configure
+++ b/Shorewall-core/configure
@@ -98,7 +98,7 @@ if [ -z "$vendor" ]; then
eval $(cat /etc/os-release | grep ^ID=)
case $ID in
- fedora)
+ fedora|rhel)
vendor=redhat
;;
debian|ubuntu)
diff --git a/Shorewall-core/configure.pl b/Shorewall-core/configure.pl
index f7f466a..c8dbd42 100755
--- a/Shorewall-core/configure.pl
+++ b/Shorewall-core/configure.pl
@@ -64,7 +64,7 @@ unless ( defined $vendor ) {
$id =~ s/ID=//;
- if ( $id eq 'fedora' ) {
+ if ( $id eq 'fedora' || $id eq 'rhel' ) {
$vendor = 'redhat';
} elsif ( $id eq 'opensuse' ) {
$vendor = 'suse';
diff --git a/Shorewall-core/install.sh b/Shorewall-core/install.sh
index 471f30c..3b7f673 100755
--- a/Shorewall-core/install.sh
+++ b/Shorewall-core/install.sh
@@ -198,7 +198,7 @@ if [ -z "$BUILD" ]; then
eval $(cat /etc/os-release | grep ^ID)
case $ID in
- fedora)
+ fedora|rhel)
BUILD=redhat
;;
debian)
diff --git a/Shorewall-lite/install.sh b/Shorewall-lite/install.sh
index 6ef2308..ebb6106 100755
--- a/Shorewall-lite/install.sh
+++ b/Shorewall-lite/install.sh
@@ -206,7 +206,7 @@ if [ -z "$BUILD" ]; then
eval $(cat /etc/os-release | grep ^ID)
case $ID in
- fedora)
+ fedora|rhel)
BUILD=redhat
;;
debian)
diff --git a/Shorewall/install.sh b/Shorewall/install.sh
index dca4667..205fcef 100755
--- a/Shorewall/install.sh
+++ b/Shorewall/install.sh
@@ -216,7 +216,7 @@ if [ -z "$BUILD" ]; then
eval $(cat /etc/os-release | grep ^ID)
case $ID in
- fedora)
+ fedora|rhel)
BUILD=redhat
;;
debian)
signature.asc
Description: OpenPGP digital signature
------------------------------------------------------------------------------ "Accelerate Dev Cycles with Automated Cross-Browser Testing - For FREE Instantly run your Selenium tests across 300+ browser/OS combos. Get unparalleled scalability from the best Selenium testing platform available Simple to use. Nothing to install. Get started now for free." http://p.sf.net/sfu/SauceLabs
_______________________________________________ Shorewall-users mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/shorewall-users
