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

Merge "yum-minimal: strip env vars in chroot calls"

Browse Source
This commit is contained in:
Zuul 2020-04-24 05:34:33 +00:00 committed by Gerrit Code Review
commit 0d0a5909e7
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
diskimage_builder/elements/yum-minimal/root.d/08-yum-chroot
View File

@ -281,11 +281,19 @@ else
_install_pkg_manager yum _install_pkg_manager yum
fi fi
# sort of like run_in_target; but we're not in a phase where that
# works yet. strip unnecessary external env vars that can cause
# problems.
function _run_chroot {
local cmd="$@"
sudo -E chroot $TARGET_ROOT env -u TMPDIR sh -c "$cmd"
}
# we just installed yum/dnf with "outside" tools (yum/rpm) which # we just installed yum/dnf with "outside" tools (yum/rpm) which
# might have created /var/lib/[yum|rpm] (etc) that are slighlty # might have created /var/lib/[yum|rpm] (etc) that are slighlty
# incompatible. Refresh everything with the in-chroot tools # incompatible. Refresh everything with the in-chroot tools
sudo -E chroot $TARGET_ROOT rpm --rebuilddb _run_chroot rpm --rebuilddb
sudo -E chroot $TARGET_ROOT ${YUM} clean all _run_chroot ${YUM} clean all
# populate the lang reduction macro in the chroot # populate the lang reduction macro in the chroot
echo "%_install_langs C:en_US:en_US.UTF-8" | \ echo "%_install_langs C:en_US:en_US.UTF-8" | \
@ -301,8 +309,8 @@ _base_packages+="systemd-udev "
# bootstrap the environment within the chroot; bring in new # bootstrap the environment within the chroot; bring in new
# metadata with an update and install some base packages we need. # metadata with an update and install some base packages we need.
sudo -E chroot $TARGET_ROOT ${YUM} -y update _run_chroot ${YUM} -y update
sudo -E chroot $TARGET_ROOT ${YUM} -y \ _run_chroot ${YUM} -y \
--setopt=cachedir=/tmp/yum/$ARCH/$DIB_RELEASE \ --setopt=cachedir=/tmp/yum/$ARCH/$DIB_RELEASE \
install ${_base_packages} install ${_base_packages}
@ -319,7 +327,7 @@ echo -e "# This file intentionally left blank\n" | \
echo -e 'LANG="en_US.UTF-8"' | \ echo -e 'LANG="en_US.UTF-8"' | \
sudo tee $TARGET_ROOT/etc/locale.conf sudo tee $TARGET_ROOT/etc/locale.conf
# default to UTC # default to UTC
sudo -E chroot $TARGET_ROOT ln -sf /usr/share/zoneinfo/UTC \ _run_chroot ln -sf /usr/share/zoneinfo/UTC \
/etc/localtime /etc/localtime
# cleanup # cleanup