summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2017-11-30 08:16:14 +0000
committerGerrit Code Review <review@openstack.org>2017-11-30 08:16:14 +0000
commit5677a30a5a83b8e12d86a86972ce4e7c15b66be9 (patch)
treeaab8bb810ed09e70e169c000192c45a6110bc301
parent8182acb0fc08e68860d776ee928798de45fe74af (diff)
parent1b203f8a3892f21abcd727eb2e204cc7a3e89ef1 (diff)
Merge "Pre-install curl"
-rwxr-xr-xdiskimage_builder/elements/yum-minimal/root.d/08-yum-chroot25
1 files changed, 13 insertions, 12 deletions
diff --git a/diskimage_builder/elements/yum-minimal/root.d/08-yum-chroot b/diskimage_builder/elements/yum-minimal/root.d/08-yum-chroot
index c59837c..055377c 100755
--- a/diskimage_builder/elements/yum-minimal/root.d/08-yum-chroot
+++ b/diskimage_builder/elements/yum-minimal/root.d/08-yum-chroot
@@ -256,7 +256,10 @@ _install_repos
256 256
257# install dnf for >= f22 257# install dnf for >= f22
258if [ $DIB_RELEASE -ge 22 ]; then 258if [ $DIB_RELEASE -ge 22 ]; then
259 _install_pkg_manager dnf dnf-plugins-core yum 259 # Fedora 27 has a "curl-minimal" package that will get pulled in as a
260 # rpm dependency. This causes problems later if/when "curl" gets
261 # installed. To avoid this, just install the full curl first up.
262 _install_pkg_manager dnf dnf-plugins-core yum curl
260else 263else
261 _install_pkg_manager yum 264 _install_pkg_manager yum
262fi 265fi
@@ -271,22 +274,20 @@ sudo -E chroot $TARGET_ROOT ${YUM} clean all
271echo "%_install_langs C:en_US:en_US.UTF-8" | \ 274echo "%_install_langs C:en_US:en_US.UTF-8" | \
272 sudo tee -a $TARGET_ROOT/etc/rpm/macros.langs > /dev/null 275 sudo tee -a $TARGET_ROOT/etc/rpm/macros.langs > /dev/null
273 276
274# bootstrap the environment within the chroot; bring in new 277_base_packages="systemd passwd findutils sudo util-linux-ng "
275# metadata with an update and install some base packages we need.
276sudo -E chroot $TARGET_ROOT ${YUM} -y update
277sudo -E chroot $TARGET_ROOT ${YUM} -y \
278 --setopt=cachedir=/tmp/yum/$ARCH/$DIB_RELEASE \
279 install systemd passwd findutils sudo util-linux-ng
280 278
281# This package is split out from systemd on >F24, dracut is 279# This package is split out from systemd on >F24, dracut is
282# missing the dependency and will fail to make an initrd without 280# missing the dependency and will fail to make an initrd without
283# it; see 281# it; see
284# https://bugzilla.redhat.com/show_bug.cgi?id=1398505 282# https://bugzilla.redhat.com/show_bug.cgi?id=1398505
285if [ $DISTRO_NAME = "fedora" -a $DIB_RELEASE -ge 24 ]; then 283_base_packages+="systemd-udev "
286 sudo -E chroot $TARGET_ROOT ${YUM} -y \ 284
287 --setopt=cachedir=/tmp/yum/$ARCH/$DIB_RELEASE \ 285# bootstrap the environment within the chroot; bring in new
288 install systemd-udev 286# metadata with an update and install some base packages we need.
289fi 287sudo -E chroot $TARGET_ROOT ${YUM} -y update
288sudo -E chroot $TARGET_ROOT ${YUM} -y \
289 --setopt=cachedir=/tmp/yum/$ARCH/$DIB_RELEASE \
290 install ${_base_packages}
290 291
291# Put in a dummy /etc/resolv.conf over the temporary one we used 292# Put in a dummy /etc/resolv.conf over the temporary one we used
292# to bootstrap. systemd has a bug/feature [1] that it will assume 293# to bootstrap. systemd has a bug/feature [1] that it will assume