From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Tue, 26 Sep 2023 09:26:03 +0000 (+0200)
Subject: Revert "CI: pin CentOS 9 kernel to workaround panic on shutdown"
X-Git-Tag: v18~38^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3594f258dc0d9c98e3e66c5c88937bbe8c084e18;p=thirdparty%2Fmkosi.git

Revert "CI: pin CentOS 9 kernel to workaround panic on shutdown"

This reverts commit f9cd279e21cce2393bb0493c577f5c74a21e6914.

This issue was fixed upstream so let's revert the commit.
---

diff --git a/.github/mkosi.conf.d/20-alma-rocky.conf b/.github/mkosi.conf.d/20-centos.conf
similarity index 87%
rename from .github/mkosi.conf.d/20-alma-rocky.conf
rename to .github/mkosi.conf.d/20-centos.conf
index 178bb095d..dafbd2916 100644
--- a/.github/mkosi.conf.d/20-alma-rocky.conf
+++ b/.github/mkosi.conf.d/20-centos.conf
@@ -1,4 +1,5 @@
 [Match]
+Distribution=|centos
 Distribution=|alma
 Distribution=|rocky
 
diff --git a/.github/mkosi.conf.d/20-centos9.conf b/.github/mkosi.conf.d/20-centos9.conf
deleted file mode 100644
index 7b36caa61..000000000
--- a/.github/mkosi.conf.d/20-centos9.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-[Match]
-Distribution=centos
-Release=9
-
-[Content]
-Packages=
-         kernel-core-5.14.0-354.el9
-         systemd
-         systemd-boot
-         udev
-         grub2-pc