From: Lennart Poettering Date: Mon, 15 Apr 2024 15:41:37 +0000 (+0200) Subject: units: order repart after systemd-tpm2-setup-early.service X-Git-Tag: v256-rc1~183 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=27dd678d2d378b46ea995389dd7641fcc6a7eb40;p=thirdparty%2Fsystemd.git units: order repart after systemd-tpm2-setup-early.service 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 --- diff --git a/units/systemd-repart.service b/units/systemd-repart.service index 5c9e6fb8b1f..1f7e2a612a7 100644 --- a/units/systemd-repart.service +++ b/units/systemd-repart.service @@ -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