summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.github/workflows/mkosi.yml9
-rw-r--r--mkosi.images/system/mkosi.conf.d/10-centos/mkosi.conf1
2 files changed, 0 insertions, 10 deletions
diff --git a/.github/workflows/mkosi.yml b/.github/workflows/mkosi.yml
index 2f5d5b28f5..2cffc3cf82 100644
--- 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 d32eae4952..843b96d9a6 100644
--- 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