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

this shouldn't have been in here, anyways

Browse Source
This commit is contained in:
Neil Hanlon 2023-11-21 16:58:30 -05:00
parent e2c20bf2cf
commit 16026735e5
Signed by: neil
GPG Key ID: 705BC21EC3C70F34
4 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
diskimage_builder/elements/base/environment.d/10-base-defaults
View File

@ -1 +1,2 @@
export DIB_AVOID_PACKAGES_UPDATE=${DIB_AVOID_PACKAGES_UPDATE:-0} export DIB_AVOID_PACKAGES_UPDATE=${DIB_AVOID_PACKAGES_UPDATE:-0}
export DIB_AVOID_ISCSI=${DIB_AVOID_ISCSI:-0}

4
diskimage_builder/elements/base/install.d/00-baseline-environment
View File

@ -7,4 +7,6 @@ fi
set -eu set -eu
set -o pipefail set -o pipefail
install-packages -m base iscsi_package if [ ${DIB_AVOID_ISCSI} -eq 0 ]]; then
install-packages -m base iscsi_package
fi

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

@ -134,11 +134,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
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
${YUM} -v -y $ACTION $EXTRA_ARGS $PKGS ${YUM} -v -y $ACTION $EXTRA_ARGS $PKGS
if [ "$ACTION" == "install" ]; then if [ "$ACTION" == "install" ]; then

1
diskimage_builder/elements/yum/post-install.d/99-reset-yum-conf
View File

@ -6,7 +6,6 @@ fi
set -eu set -eu
set -o pipefail set -o pipefail
if [[ -n ${DIB_YUM_DNF_CONTENTDIR:-''} ]]; then if [[ -n ${DIB_YUM_DNF_CONTENTDIR:-''} ]]; then
sudo mv /etc/dnf/vars/contentdir.bak /etc/dnf/vars/contentdir 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 sudo sed -i -e 's,^#mirrorlist,mirrorlist,' -e 's,^baseurl,#baseurl,' /etc/yum.repos.d/*.repo