]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
units: order repart after systemd-tpm2-setup-early.service
authorLennart Poettering <lennart@poettering.net>
Mon, 15 Apr 2024 15:41:37 +0000 (17:41 +0200)
committerLuca Boccassi <luca.boccassi@gmail.com>
Mon, 15 Apr 2024 20:33:45 +0000 (22:33 +0200)
This mimics what we do for systemd-cryptsetup@.service (see
src/shared/generator.c), and makes sense since repart might lock up the
root volume against a TPM, which ideally has its SRK already set up by
then.

More importantly though, this ensures that we ordered correctly after
tpm2.target (which systemd-tpm2-setup-early.service has a dependency
on), for systems where the TPM drivers are not compiled into the kernel.

See: https://lists.freedesktop.org/archives/systemd-devel/2024-April/050201.html

units/systemd-repart.service

index 5c9e6fb8b1ff3084b65a41a134bebf671deaa7d5..1f7e2a612a71f948015dafe5ffc9fcc6300c46ea 100644 (file)
@@ -21,7 +21,7 @@ ConditionDirectoryNotEmpty=|/sysusr/usr/local/lib/repart.d
 
 DefaultDependencies=no
 Wants=modprobe@loop.service modprobe@dm_mod.service
-After=initrd-usr-fs.target modprobe@loop.service modprobe@dm_mod.service
+After=initrd-usr-fs.target modprobe@loop.service modprobe@dm_mod.service systemd-tpm2-setup-early.service
 Before=initrd-root-fs.target
 Conflicts=shutdown.target initrd-switch-root.target
 Before=shutdown.target initrd-switch-root.target