summaryrefslogtreecommitdiffstats
path: root/mkosi.images/system
diff options
context:
space:
mode:
authorFrantisek Sumsal <frantisek@sumsal.cz>2023-12-19 12:06:24 +0100
committerFrantisek Sumsal <frantisek@sumsal.cz>2023-12-19 13:48:55 +0100
commit97e52d62fbf9890bfc55193898ccffdc638ec182 (patch)
treec2a0b60414b357a232aae0579ee8cc1354c47ede /mkosi.images/system
parentfind-esp: add debugging log about failure in parsing env variable (diff)
downloadsystemd-97e52d62fbf9890bfc55193898ccffdc638ec182.tar.xz
systemd-97e52d62fbf9890bfc55193898ccffdc638ec182.zip
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.
Diffstat (limited to 'mkosi.images/system')
-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, 5 insertions, 19 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 145c79bf63..67d46432d4 100644
--- 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 af4862d4b1..146e03a895 100644
--- 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
index 30643e72b3..0000000000
--- 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
index a21739f230..0000000000
--- 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 620688e51b..5863f03b19 100644
--- 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