From 30c1624820792ac941790cf13f74b205ba5c16aa Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Fri, 13 Jan 2023 16:01:03 +0100 Subject: [PATCH] centos: Install epel-release if EPEL repository is configured --- .github/workflows/ci.yml | 2 +- mkosi/distributions/centos.py | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index eb04528be..6870b048c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -195,7 +195,7 @@ jobs: - name: Configure EPEL if: matrix.distro == 'centos' || matrix.distro == 'rocky' || matrix.distro == 'alma' run: | - tee mkosi.conf.d/mkosi.conf <<- EOF + tee mkosi.conf.d/epel.conf <<- EOF [Distribution] Repositories=epel EOF diff --git a/mkosi/distributions/centos.py b/mkosi/distributions/centos.py index 6b13bb4b6..bb1924811 100644 --- a/mkosi/distributions/centos.py +++ b/mkosi/distributions/centos.py @@ -63,6 +63,7 @@ class CentosInstaller(DistributionInstaller): packages.update(state.config.build_packages) if not state.do_run_build_script and "epel" in state.config.repositories: + add_packages(state.config, packages, "epel-release") if state.config.netdev: add_packages(state.config, packages, "systemd-networkd", conditional="systemd") if state.config.distribution != Distribution.centos and epel_release >= 9: -- 2.47.2