mkosi: Drop workarounds

With the latest Github Actions image release none of these should
be required anymore (20240414.1.1).

diff --git a/.github/workflows/mkosi.yml b/.github/workflows/mkosi.yml
index 2f5d5b28f5c0d07aa6b7d23746b4daaf7d2fb02e..2cffc3cf8264ed8691bdad6415fe35e560b9d6fa 100644 (file)
--- a/.github/workflows/mkosi.yml
+++ b/.github/workflows/mkosi.yml
@@ -119,15 +119,6 @@ jobs:
                                systemd.default_device_timeout_sec=180
         EOF
 
-        # For erofs, we have to install linux-modules-extra-azure, but that doesn't match the running kernel
-        # version, so we can't load the erofs module. squashfs is a builtin module so we use that instead.
-
-        mkdir -p mkosi.images/system/mkosi.repart/10-usr.conf.d
-        tee mkosi.images/system/mkosi.repart/10-usr.conf.d/squashfs.conf <<EOF
-        [Partition]
-        Format=squashfs
-        EOF
-
         # The emergency shell is not useful in the CI, as it just blocks for a long time before the job
         # eventually times out. Override it to just shutdown immediately.
         mkdir -p mkosi.images/initrd/mkosi.extra/usr/lib/systemd/system/emergency.service.d/

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 d32eae4952312ecd6e5d0321fb3d525ab67ff11c..843b96d9a61f37b02153f53f68df5ce6a258d2d3 100644 (file)
--- a/mkosi.images/system/mkosi.conf.d/10-centos/mkosi.conf
+++ b/mkosi.images/system/mkosi.conf.d/10-centos/mkosi.conf
@@ -5,5 +5,4 @@ Distribution=centos
 
 [Content]
 Packages=
-        kernel-modules # For squashfs support
         rpmautospec-rpm-macros