From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Fri, 13 Jan 2023 15:01:03 +0000 (+0100)
Subject: centos: Install epel-release if EPEL repository is configured
X-Git-Tag: v15~365^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F1305%2Fhead;p=thirdparty%2Fmkosi.git

centos: Install epel-release if EPEL repository is configured
---

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: