cleanup after

diskimage_builder/elements/yum/bin/install-packages

@@ -135,6 +135,7 @@ if [ -n "$WHITELIST" ]; then
     # [1] https://bugzilla.redhat.com/show_bug.cgi?id=965567
     set -o xtrace
     if [[ -n ${DIB_YUM_DNF_CONTENTDIR:-''} ]]; then
+      sudo cp /etc/dnf/vars/contentdir /etc/dnf/vars/contentdir.bak
       echo $DIB_YUM_DNF_CONTENTDIR | sudo tee /etc/dnf/vars/contentdir
       sudo sed -i -e 's,^mirrorlist,#mirrorlist,' -e 's,^#baseurl,baseurl,' /etc/yum.repos.d/*.repo
     fi

diskimage_builder/elements/yum/cleanup.d/99-remove-yum-repo-conf

@@ -6,6 +6,11 @@ fi
 set -eu
 set -o pipefail
 
+if [[ -n ${DIB_YUM_DNF_CONTENTDIR:-''} ]]; then
+  sudo mv /etc/dnf/vars/contentdir.bak /etc/dnf/vars/contentdir
+  sudo sed -i -e 's,^#mirrorlist,mirrorlist,' -e 's,^baseurl,#baseurl,' /etc/yum.repos.d/*.repo
+fi
+
 # exit directly if DIB_YUM_REPO_CONF is not defined properly
 if [ -z "${DIB_YUM_REPO_CONF:-}" ] ; then
     echo "DIB_YUM_REPO_CONF is not set - no repo configurations will be cleaned up"