summaryrefslogtreecommitdiff
path: root/mkosi.presets
diff options
context:
space:
mode:
authorDaan De Meyer <daan.j.demeyer@gmail.com>2023-05-09 15:04:56 +0200
committerDaan De Meyer <daan.j.demeyer@gmail.com>2023-05-12 11:38:02 +0200
commit104afc730070fdf3ffad6636e6c465d234d79f54 (patch)
treea973b937ba12ee4559577c5b796cffc16185232f /mkosi.presets
parent39886236e87dee15ae7ca5aea5d23509a077ace8 (diff)
downloadsystemd-104afc730070fdf3ffad6636e6c465d234d79f54.tar.gz
mkosi: Use zstd compression on non-centos distros
Just because centos doesn't support it doesn't mean we can't use it on the other distros.
Diffstat (limited to 'mkosi.presets')
-rw-r--r--mkosi.presets/10-initrd/mkosi.conf (renamed from mkosi.presets/10-initrd.conf)4
-rw-r--r--mkosi.presets/10-initrd/mkosi.conf.d/10-centos.conf8
-rw-r--r--mkosi.presets/10-initrd/mkosi.conf.d/10-default.conf7
3 files changed, 16 insertions, 3 deletions
diff --git a/mkosi.presets/10-initrd.conf b/mkosi.presets/10-initrd/mkosi.conf
index 6516b510c7..40fd6c4005 100644
--- a/mkosi.presets/10-initrd.conf
+++ b/mkosi.presets/10-initrd/mkosi.conf
@@ -5,11 +5,9 @@ Bootable=auto,yes
[Output]
Format=cpio
-# TODO: Switch to zstd once we stop building CentOS Stream 8.
-CompressOutput=xz
[Content]
-BaseTrees=mkosi.output/base
+BaseTrees=../../mkosi.output/base
MakeInitrd=yes
# Arch Linux doesn't split their gcc-libs package so we manually remove unneeded stuff here to make sure it
diff --git a/mkosi.presets/10-initrd/mkosi.conf.d/10-centos.conf b/mkosi.presets/10-initrd/mkosi.conf.d/10-centos.conf
new file mode 100644
index 0000000000..c25a17a030
--- /dev/null
+++ b/mkosi.presets/10-initrd/mkosi.conf.d/10-centos.conf
@@ -0,0 +1,8 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+[Match]
+Distribution=centos
+
+[Output]
+# TODO: Switch to zstd once we stop building CentOS Stream 8.
+CompressOutput=xz
diff --git a/mkosi.presets/10-initrd/mkosi.conf.d/10-default.conf b/mkosi.presets/10-initrd/mkosi.conf.d/10-default.conf
new file mode 100644
index 0000000000..98f0b7dffb
--- /dev/null
+++ b/mkosi.presets/10-initrd/mkosi.conf.d/10-default.conf
@@ -0,0 +1,7 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+[Match]
+Distribution=arch debian fedora opensuse ubuntu
+
+[Output]
+CompressOutput=zst