summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2017-11-30 07:54:38 +0000
committerGerrit Code Review <review@openstack.org>2017-11-30 07:54:38 +0000
commit8182acb0fc08e68860d776ee928798de45fe74af (patch)
tree88d6b0685c210fbca7ab5b2d39b46136dfe1320a
parent6a28810ad8559f9330dfad978cc22a1f0d40d64c (diff)
parentbf8de79940ede23841fed4f96fddb0b95ba6550e (diff)
Merge "Install fedora-gpg-keys for F27"
-rwxr-xr-xdiskimage_builder/elements/yum-minimal/root.d/08-yum-chroot13
1 files changed, 9 insertions, 4 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 0698051..c59837c 100755
--- a/diskimage_builder/elements/yum-minimal/root.d/08-yum-chroot
+++ b/diskimage_builder/elements/yum-minimal/root.d/08-yum-chroot
@@ -72,10 +72,15 @@ function _install_repos {
72 packages="basesystem filesystem setup " 72 packages="basesystem filesystem setup "
73 73
74 packages+="${DISTRO_NAME}-release " 74 packages+="${DISTRO_NAME}-release "
75 # after fedora21, this is split into into a separate -repos 75
76 # package 76 # Starting in F21 this was split into a separate package
77 if [ $DISTRO_NAME = fedora ]; then 77 if [[ ${DISTRO_NAME} == 'fedora' ]]; then
78 packages+="${DISTRO_NAME}-repos " 78 packages+="fedora-repos "
79 fi
80
81 # F27 started putting gpg keys into this separate package
82 if [[ ${DISTRO_NAME} = fedora && ${DIB_RELEASE} -gt 26 ]]; then
83 packages+="fedora-gpg-keys "
79 fi 84 fi
80 85
81 # By default, parent elements (fedora-minimal, centos-minimal) 86 # By default, parent elements (fedora-minimal, centos-minimal)