From 2dc415472406cb284e418818540a2d6735946231 Mon Sep 17 00:00:00 2001
From: Ian Wienand <iwienand@redhat.com>
Date: Fri, 15 Apr 2016 12:07:37 +1000
Subject: [PATCH] Fix up EPEL element

For whatever reason, RHEL identifies itself with DISTRO "rhel" for 6
and "rhel7" for 7, but centos just uses "centos" and DIB_RELEASE.  So
this was wrong and installing EPEL6 on centos7.

But we can simplify it completely for centos because that comes with
the epel-release package already included.

Change-Id: I2b8f5d30b850fef46b4a5ba32a917abcbf25932c
---
 .../epel/pre-install.d/05-rpm-epel-release    | 49 ++++++++++---------
 1 file changed, 27 insertions(+), 22 deletions(-)

diff --git a/elements/epel/pre-install.d/05-rpm-epel-release b/elements/epel/pre-install.d/05-rpm-epel-release
index 4964fbd9..5aa35624 100755
--- a/elements/epel/pre-install.d/05-rpm-epel-release
+++ b/elements/epel/pre-install.d/05-rpm-epel-release
@@ -6,31 +6,36 @@ fi
 set -eu
 set -o pipefail
 
-[ -n "$ARCH" ]
+if [[ ${DISTRO_NAME} =~ "centos" ]]; then
+    # Centos has "epel-release" in extras, which is default enabled.
+    yum install -y epel-release
+else
+    # For RHEL, we have to scrape the download page to find the latest
+    # release and install that
+    [ -n "$ARCH" ]
+    if [ 'amd64' = "$ARCH" ] ; then
+        ARCH="x86_64"
+    fi
 
-if [ 'amd64' = "$ARCH" ] ; then
-    ARCH="x86_64"
+    BASE_URL=${DIB_EPEL_MIRROR:-https://dl.fedoraproject.org/pub/epel}
+    case "$DISTRO_NAME" in
+        rhel7)
+            RELEASE=7
+            URL=$BASE_URL/$RELEASE/x86_64/e/
+            ;;
+        rhel)
+            RELEASE=6
+            URL=$BASE_URL/$RELEASE/$ARCH/
+            ;;
+        *)
+            echo "$DISTRO_NAME is not supported"
+            exit 1
+            ;;
+    esac
+    PKG_NAME=$(wget -q $URL -O - |grep -oE "(href=\"epel-release-$RELEASE-[0-9,.].*)" | cut -d'"' -f2)
+    rpm -q epel-release || yum install -y $URL/$PKG_NAME
 fi
 
-BASE_URL=${DIB_EPEL_MIRROR:-https://dl.fedoraproject.org/pub/epel}
-case "$DISTRO_NAME" in
-    rhel7|centos7)
-        RELEASE=7
-        URL=$BASE_URL/$RELEASE/x86_64/e/
-        ;;
-    rhel|centos)
-        RELEASE=6
-        URL=$BASE_URL/$RELEASE/$ARCH/
-        ;;
-    *)
-        echo "$DISTRO_NAME is not supported"
-        exit 1
-        ;;
-esac
-PKG_NAME=$(wget -q $URL -O - |grep -oE "(href=\"epel-release-$RELEASE-[0-9,.].*)" | cut -d'"' -f2)
-rpm -q epel-release || yum install -y $URL/$PKG_NAME
-
-
 DIB_EPEL_MIRROR=${DIB_EPEL_MIRROR:-}
 [ -n "$DIB_EPEL_MIRROR" ] || exit 0