From 5d60979e932fd8b81021dac8e5a8e56207f6a561 Mon Sep 17 00:00:00 2001 From: Paul Belanger Date: Thu, 2 May 2019 19:57:33 -0400 Subject: [PATCH] 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 --- diskimage_builder/elements/yum-minimal/root.d/08-yum-chroot | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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 67f9fa903..330babd3d 100755 --- a/diskimage_builder/elements/yum-minimal/root.d/08-yum-chroot +++ b/diskimage_builder/elements/yum-minimal/root.d/08-yum-chroot @@ -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