openstack
/
diskimage-builder
Code Issues Proposed changes

Merge "rpm-distro: set the contentdir yum var"

This commit is contained in:
Zuul 2018-05-14 12:36:11 +00:00 committed by Gerrit Code Review
parent d79a7aaf01 25964c5c5b
commit a8df61edbb
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -28,7 +28,7 @@ else
exit 1
fi
if [[ $DISTRO_NAME == "fedora" && $DIB_RELEASE -ge 22 ]]; then
if [[ $DISTRO_NAME == "fedora" ]]; then
mkdir -p /etc/dnf/vars
echo $basearch > /etc/dnf/vars/basearch
echo $arch > /etc/dnf/vars/arch
@ -36,3 +36,12 @@ else
echo $basearch > /etc/yum/vars/basearch
echo $arch > /etc/yum/vars/arch
fi
if [[ ${DISTRO_NAME} =~ "centos" ]]; then
if [[ ${arch} == "x86_64" ]]; then
contentdir=centos
else
contentdir=altarch
fi
echo $contentdir > /etc/yum/vars/contentdir
fi