mkosi: pin CentOS8 kernel to working version

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

diff --git a/mkosi.images/system/mkosi.conf.d/10-centos-fedora.conf b/mkosi.images/system/mkosi.conf.d/10-centos-fedora.conf
index c007be2f84f7a3e3a3cf8aa3e816c54bf3d2a6ee..7b69969da4cd9501c29b2825287ed2e000e838bd 100644 (file)
--- a/mkosi.images/system/mkosi.conf.d/10-centos-fedora.conf
+++ b/mkosi.images/system/mkosi.conf.d/10-centos-fedora.conf
@@ -13,7 +13,6 @@ Packages=
         glib2
         iproute
         iproute-tc
-        kernel-core
         libcap-ng-utils
         netcat
         openssh-server

diff --git a/mkosi.images/system/mkosi.conf.d/10-centos/mkosi.conf b/mkosi.images/system/mkosi.conf.d/10-centos/mkosi.conf
index 146e03a89551fe02a256c4a662504700f9370c37..af4862d4b147031ac251a0d823833b2afab1557e 100644 (file)
--- a/mkosi.images/system/mkosi.conf.d/10-centos/mkosi.conf
+++ b/mkosi.images/system/mkosi.conf.d/10-centos/mkosi.conf
@@ -2,7 +2,3 @@
 
 [Match]
 Distribution=centos
-
-[Content]
-Packages=
-        kernel-modules # For squashfs support

diff --git a/mkosi.images/system/mkosi.conf.d/10-centos/mkosi.conf.d/10-centos8.conf b/mkosi.images/system/mkosi.conf.d/10-centos/mkosi.conf.d/10-centos8.conf
new file mode 100644 (file)
index 0000000..30643e7
--- /dev/null
+++ b/mkosi.images/system/mkosi.conf.d/10-centos/mkosi.conf.d/10-centos8.conf
@@ -0,0 +1,9 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+[Match]
+Release=8
+
+[Content]
+Packages=
+        kernel-core-4.18.0-521.el8
+        kernel-modules-4.18.0-521.el8 # For squashfs support

diff --git a/mkosi.images/system/mkosi.conf.d/10-centos/mkosi.conf.d/10-centos9.conf b/mkosi.images/system/mkosi.conf.d/10-centos/mkosi.conf.d/10-centos9.conf
new file mode 100644 (file)
index 0000000..a21739f
--- /dev/null
+++ b/mkosi.images/system/mkosi.conf.d/10-centos/mkosi.conf.d/10-centos9.conf
@@ -0,0 +1,9 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+[Match]
+Release=9
+
+[Content]
+Packages=
+        kernel-core
+        kernel-modules

diff --git a/mkosi.images/system/mkosi.conf.d/10-fedora.conf b/mkosi.images/system/mkosi.conf.d/10-fedora.conf
index 42d0093a89c6e4493f9502b27a42f46fd5c7178a..281e9464f621af0cb958e115d5149d8af1f8f6ab 100644 (file)
--- a/mkosi.images/system/mkosi.conf.d/10-fedora.conf
+++ b/mkosi.images/system/mkosi.conf.d/10-fedora.conf
@@ -8,3 +8,4 @@ Packages=
         btrfs-progs
         compsize
         f2fs-tools
+        kernel-core