From 966926fac554fe40e9389d53b1b5b00ee434667a Mon Sep 17 00:00:00 2001 From: Tom Eastep Date: Mon, 19 May 2014 15:15:52 -0700 Subject: [PATCH] RHE7 support -- first cut Signed-off-by: Tom Eastep --- Shorewall-core/configure | 2 +- Shorewall-core/configure.pl | 2 +- Shorewall-core/install.sh | 2 +- Shorewall-lite/install.sh | 2 +- Shorewall/install.sh | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Shorewall-core/configure b/Shorewall-core/configure index c722022e4..046790459 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 f7f466af1..c8dbd425d 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 471f30c1c..3b7f673df 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 6ef230831..ebb6106e7 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 dca46673e..205fceff4 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)