summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaan De Meyer <daan.j.demeyer@gmail.com>2023-11-28 23:19:44 +0100
committerDaan De Meyer <daan.j.demeyer@gmail.com>2023-11-28 23:19:44 +0100
commita64398b2ca1cdaee291550face0d1ce5f8ea52f6 (patch)
treebed602e6eb25de588e613cf338193b457b99b68f
parentUpdate to mkosi v19 (diff)
downloadsystemd-a64398b2ca1cdaee291550face0d1ce5f8ea52f6.tar.xz
systemd-a64398b2ca1cdaee291550face0d1ce5f8ea52f6.zip
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.
-rw-r--r--mkosi.images/system/mkosi.conf.d/10-centos-fedora.conf1
-rw-r--r--mkosi.images/system/mkosi.conf.d/10-centos/mkosi.conf4
-rw-r--r--mkosi.images/system/mkosi.conf.d/10-centos/mkosi.conf.d/10-centos8.conf9
-rw-r--r--mkosi.images/system/mkosi.conf.d/10-centos/mkosi.conf.d/10-centos9.conf9
-rw-r--r--mkosi.images/system/mkosi.conf.d/10-fedora.conf1
5 files changed, 19 insertions, 5 deletions
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 c007be2f84..7b69969da4 100644
--- 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 146e03a895..af4862d4b1 100644
--- 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
index 0000000000..30643e72b3
--- /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
index 0000000000..a21739f230
--- /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 42d0093a89..281e9464f6 100644
--- 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