From 7c74084eca4dbf7f0ca21f5116bd4bd9845af61c Mon Sep 17 00:00:00 2001 From: Pino Toscano Date: Wed, 6 May 2015 15:47:03 +0200 Subject: [PATCH] centos/centos7: switch to epel element Instead of manually creating epel.repo files, make use of the epel element, which will properly install epel-release. Change-Id: Iea7b389bc1ade716c622fd39d5e7dcf119dcb447 --- elements/centos/element-deps | 1 + elements/centos/pre-install.d/02-yum-repos | 9 --------- elements/centos7/element-deps | 1 + elements/centos7/pre-install.d/01-yum-repos | 9 --------- 4 files changed, 2 insertions(+), 18 deletions(-) diff --git a/elements/centos/element-deps b/elements/centos/element-deps index 57b194ac..aad5a273 100644 --- a/elements/centos/element-deps +++ b/elements/centos/element-deps @@ -1,5 +1,6 @@ cache-url dib-run-parts +epel redhat-common rpm-distro yum diff --git a/elements/centos/pre-install.d/02-yum-repos b/elements/centos/pre-install.d/02-yum-repos index c0d60e3a..fb5a0b9b 100755 --- a/elements/centos/pre-install.d/02-yum-repos +++ b/elements/centos/pre-install.d/02-yum-repos @@ -14,12 +14,3 @@ enabled=1 metadata_expire=7d gpgcheck=0 EOF - -cat << EOF > /etc/yum.repos.d/epel.repo -[epel] -name=Extra Packages for Enterprise Linux 6 - \$basearch -mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=epel-6&arch=\$basearch -failovermethod=priority -enabled=1 -gpgcheck=0 -EOF diff --git a/elements/centos7/element-deps b/elements/centos7/element-deps index c6e5925f..1776d4a8 100644 --- a/elements/centos7/element-deps +++ b/elements/centos7/element-deps @@ -1,5 +1,6 @@ cache-url dib-run-parts +epel redhat-common rpm-distro source-repositories diff --git a/elements/centos7/pre-install.d/01-yum-repos b/elements/centos7/pre-install.d/01-yum-repos index 1ec03dd1..00390121 100755 --- a/elements/centos7/pre-install.d/01-yum-repos +++ b/elements/centos7/pre-install.d/01-yum-repos @@ -14,12 +14,3 @@ enabled=1 metadata_expire=7d gpgcheck=0 EOF - -cat << EOF > /etc/yum.repos.d/epel.repo -[epel] -name=Extra Packages for Enterprise Linux 7 - \$basearch -mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=epel-7&arch=\$basearch -failovermethod=priority -enabled=1 -gpgcheck=0 -EOF