sig_cloud/diskimage-builder
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cleanup after

Browse Source
This commit is contained in:
Neil Hanlon 2023-11-21 12:38:48 -05:00
parent d06a66d0f0
commit b2d4d75686
Signed by: neil
GPG Key ID: 705BC21EC3C70F34
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
diskimage_builder/elements/yum/bin/install-packages
View File

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

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

@ -6,6 +6,11 @@ fi
set -eu set -eu
set -o pipefail 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 # exit directly if DIB_YUM_REPO_CONF is not defined properly
if [ -z "${DIB_YUM_REPO_CONF:-}" ] ; then if [ -z "${DIB_YUM_REPO_CONF:-}" ] ; then
echo "DIB_YUM_REPO_CONF is not set - no repo configurations will be cleaned up" echo "DIB_YUM_REPO_CONF is not set - no repo configurations will be cleaned up"