From b2d4d75686d72cb67327736144e0b40b662ca9c4 Mon Sep 17 00:00:00 2001
From: Neil Hanlon <neil@rockylinux.org>
Date: Tue, 21 Nov 2023 12:38:48 -0500
Subject: [PATCH] cleanup after

---
 diskimage_builder/elements/yum/bin/install-packages          | 1 +
 .../elements/yum/cleanup.d/99-remove-yum-repo-conf           | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/diskimage_builder/elements/yum/bin/install-packages b/diskimage_builder/elements/yum/bin/install-packages
index 5572c03d..5b523ef9 100755
--- a/diskimage_builder/elements/yum/bin/install-packages
+++ b/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
diff --git a/diskimage_builder/elements/yum/cleanup.d/99-remove-yum-repo-conf b/diskimage_builder/elements/yum/cleanup.d/99-remove-yum-repo-conf
index 7795146d..bf159b92 100755
--- a/diskimage_builder/elements/yum/cleanup.d/99-remove-yum-repo-conf
+++ b/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"