openstack
/
diskimage-builder
Code Issues Proposed changes

Use fedora-release-common for fedora 30+ 

It looks like fedora-release on fedora 30+ has been split into sub
packages. Use fedora-release-common to avoid package conflicts.

Change-Id: I8f8711044fc4074b91939e0a6dfdac4d7a14a35b
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
This commit is contained in:
Paul Belanger 2019-05-02 19:57:33 -04:00
parent fa34eb7fe4
commit 5d60979e93
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -73,7 +73,11 @@ function _install_repos {
# (see above) so ...
packages="basesystem filesystem setup "
packages+="${DISTRO_NAME}-release "
if [[ ${DISTRO_NAME} = fedora && ${DIB_RELEASE} -gt 29 ]]; then
packages+="${DISTRO_NAME}-release-common "
else
packages+="${DISTRO_NAME}-release "
fi
# Starting in F21 this was split into a separate package
if [[ ${DISTRO_NAME} == 'fedora' ]]; then