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

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

@@ -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