Revert "mkosi: pin CentOS8 kernel to working version"

A fixed kernel finally landed on mirrors, so let's revert the C8S kernel
pin.

This reverts commit a64398b2ca1cdaee291550face0d1ce5f8ea52f6.

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 145c79bf63d5f718a90bf4a2219d72a3bbae6cf8..67d46432d40f81dd20c675b161f67bc72fc30280 100644 (file)
--- a/mkosi.images/system/mkosi.conf.d/10-centos-fedora.conf
+++ b/mkosi.images/system/mkosi.conf.d/10-centos-fedora.conf
@@ -14,6 +14,7 @@ Packages=
         integritysetup
         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 af4862d4b147031ac251a0d823833b2afab1557e..146e03a89551fe02a256c4a662504700f9370c37 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,3 +2,7 @@
 
 [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
deleted file mode 100644 (file)
index 30643e7..0000000
--- a/mkosi.images/system/mkosi.conf.d/10-centos/mkosi.conf.d/10-centos8.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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
deleted file mode 100644 (file)
index a21739f..0000000
--- a/mkosi.images/system/mkosi.conf.d/10-centos/mkosi.conf.d/10-centos9.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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 620688e51b985ac1e36c57aa3e1b57a262a3b8f0..5863f03b19c0cc3740871758f8ef695714dc9099 100644 (file)
--- a/mkosi.images/system/mkosi.conf.d/10-fedora.conf
+++ b/mkosi.images/system/mkosi.conf.d/10-fedora.conf
@@ -9,4 +9,3 @@ Packages=
         compsize
         f2fs-tools
         glibc-langpack-en
-        kernel-core