openstack/diskimage-builder
Code Issues Proposed changes

Merge "Set and export DIB_RELEASE for centos7"

Browse Source
This commit is contained in:
Jenkins 2015-08-07 04:54:46 +00:00 committed by Gerrit Code Review
commit 9e42c69c80
4 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
elements/centos7/environment.d/10-centos7-distro-name.bash
View File

@ -1 +1,2 @@
export DIB_RELEASE=GenericCloud
export DISTRO_NAME=centos7 export DISTRO_NAME=centos7

2
elements/rpm-distro/pre-install.d/01-override-yum-arch
View File

@ -25,7 +25,7 @@ else
exit 1 exit 1
fi fi
if [ $DIB_RELEASE -ge 22 ]; then if [[ $DISTRO_NAME == "fedora" && $DIB_RELEASE -ge 22 ]]; then
mkdir -p /etc/dnf/vars mkdir -p /etc/dnf/vars
echo $basearch > /etc/dnf/vars/basearch echo $basearch > /etc/dnf/vars/basearch
echo $arch > /etc/dnf/vars/basearch echo $arch > /etc/dnf/vars/basearch

2
elements/yum/post-install.d/99-reset-yum-conf
View File

@ -6,7 +6,7 @@ fi
set -eu set -eu
set -o pipefail set -o pipefail
if [ $DIB_RELEASE -ge 22 ]; then if [[ $DISTRO_NAME == "fedora" && $DIB_RELEASE -ge 22 ]]; then
cfg=/etc/dnf/dnf.conf cfg=/etc/dnf/dnf.conf
else else
cfg=/etc/yum.conf cfg=/etc/yum.conf

2
elements/yum/pre-install.d/01-yum-keepcache
View File

@ -6,7 +6,7 @@ fi
set -eu set -eu
set -o pipefail set -o pipefail
if [ $DIB_RELEASE -ge 22 ]; then if [[ $DISTRO_NAME == "fedora" && $DIB_RELEASE -ge 22 ]]; then
# dnf is slightly different; doesn't have these by default # dnf is slightly different; doesn't have these by default
cfg=/etc/dnf/dnf.conf cfg=/etc/dnf/dnf.conf
echo "keepcache=1" >> $cfg echo "keepcache=1" >> $cfg