From: Daan De Meyer Date: Tue, 25 Mar 2025 12:54:39 +0000 (+0100) Subject: initrd: Move p11-kit to pksc11 profile X-Git-Tag: v26~303 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a63dd993db1dd7e58ff86ac75780fb4ad39a923c;p=thirdparty%2Fmkosi.git initrd: Move p11-kit to pksc11 profile This stuff is rather niche, so let's move it to a profile similar to lvm and raid. --- diff --git a/mkosi/config.py b/mkosi/config.py index 59ae35cbf..1e090c1cd 100644 --- a/mkosi/config.py +++ b/mkosi/config.py @@ -613,6 +613,7 @@ class ToolsTreeProfile(StrEnum): class InitrdProfile(StrEnum): lvm = enum.auto() + pkcs11 = enum.auto() raid = enum.auto() diff --git a/mkosi/resources/man/mkosi.1.md b/mkosi/resources/man/mkosi.1.md index 4d78b375a..c991c69b8 100644 --- a/mkosi/resources/man/mkosi.1.md +++ b/mkosi/resources/man/mkosi.1.md @@ -1028,6 +1028,7 @@ boolean argument: either `1`, `yes`, or `true` to enable, or `0`, `no`, disabled. The `lvm` profile enables support for LVM. + The `pkcs11` profile enables support for PKCS#11. The `raid` profile enables support for RAID arrays. `InitrdPackages=`, `--initrd-package=` diff --git a/mkosi/resources/mkosi-initrd/mkosi.conf b/mkosi/resources/mkosi-initrd/mkosi.conf index 1b1f0ee86..a5c386374 100644 --- a/mkosi/resources/mkosi-initrd/mkosi.conf +++ b/mkosi/resources/mkosi-initrd/mkosi.conf @@ -15,7 +15,6 @@ Packages= udev bash # for emergency logins less # this makes 'systemctl' much nicer to use ;) - p11-kit # dl-opened by systemd gzip # For compressed keymap unpacking by loadkeys RemoveFiles= diff --git a/mkosi/resources/mkosi-initrd/mkosi.profiles/pkcs11/mkosi.conf b/mkosi/resources/mkosi-initrd/mkosi.profiles/pkcs11/mkosi.conf new file mode 100644 index 000000000..d6d473667 --- /dev/null +++ b/mkosi/resources/mkosi-initrd/mkosi.profiles/pkcs11/mkosi.conf @@ -0,0 +1,4 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later + +[Content] +Packages=p11-kit