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 59ae35cbf1b2b9a11026a6c7f0bc1c3e959b5d46..1e090c1cd64129b156c981a63947fd595e3d022e 100644 (file)
--- 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 4d78b375ac9039a9dd796ef53ea92413e74dedae..c991c69b8c80af7270d32b961aa3cdeabae53fd2 100644 (file)
--- 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 1b1f0ee864991ecd8c2350fb99292c458af4150e..a5c386374ad5f20df07c341190a2f7b1c37cd078 100644 (file)
--- 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 (file)
index 0000000..d6d4736
--- /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