From: Luca Boccassi <bluca@debian.org>
Date: Wed, 30 Aug 2023 11:57:49 +0000 (+0100)
Subject: mkosi: pin CentOS9 kernel to working version
X-Git-Tag: v255-rc1~617
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b0881b65a69e83decab3df0d2b23206cea59bb1b;p=thirdparty%2Fsystemd.git

mkosi: pin CentOS9 kernel to working version

Newer kernels are affected by a regression that causes a kernel panic
on shutdown, so pin them for now. Can be reverted once that problem is
fixed.

https://bugzilla.redhat.com/show_bug.cgi?id=2234390
---

diff --git a/mkosi.presets/system/mkosi.conf.d/10-centos-fedora.conf b/mkosi.presets/system/mkosi.conf.d/10-centos-fedora.conf
index ad77a2b8d4b..7b69969da4c 100644
--- a/mkosi.presets/system/mkosi.conf.d/10-centos-fedora.conf
+++ b/mkosi.presets/system/mkosi.conf.d/10-centos-fedora.conf
@@ -13,8 +13,6 @@ Packages=
         glib2
         iproute
         iproute-tc
-        kernel-core
-        kernel-modules # For squashfs support
         libcap-ng-utils
         netcat
         openssh-server
diff --git a/mkosi.presets/system/mkosi.conf.d/10-centos8.conf b/mkosi.presets/system/mkosi.conf.d/10-centos8.conf
new file mode 100644
index 00000000000..f38b26582e8
--- /dev/null
+++ b/mkosi.presets/system/mkosi.conf.d/10-centos8.conf
@@ -0,0 +1,10 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+[Match]
+Distribution=centos
+Release=8
+
+[Content]
+Packages=
+        kernel-core
+        kernel-modules # For squashfs support
diff --git a/mkosi.presets/system/mkosi.conf.d/10-centos9.conf b/mkosi.presets/system/mkosi.conf.d/10-centos9.conf
new file mode 100644
index 00000000000..01138514fc4
--- /dev/null
+++ b/mkosi.presets/system/mkosi.conf.d/10-centos9.conf
@@ -0,0 +1,10 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+[Match]
+Distribution=centos
+Release=9
+
+[Content]
+Packages=
+        kernel-core-5.14.0-354.el9
+        kernel-modules-5.14.0-354.el9 # For squashfs support
diff --git a/mkosi.presets/system/mkosi.conf.d/10-fedora.conf b/mkosi.presets/system/mkosi.conf.d/10-fedora.conf
index 42d0093a89c..c48b678ad88 100644
--- a/mkosi.presets/system/mkosi.conf.d/10-fedora.conf
+++ b/mkosi.presets/system/mkosi.conf.d/10-fedora.conf
@@ -8,3 +8,5 @@ Packages=
         btrfs-progs
         compsize
         f2fs-tools
+        kernel-core
+        kernel-modules # For squashfs support