summaryrefslogtreecommitdiff
path: root/units
diff options
context:
space:
mode:
authorJason A. Donenfeld <Jason@zx2c4.com>2022-11-18 02:49:16 +0100
committerLuca Boccassi <luca.boccassi@gmail.com>2022-11-23 00:56:45 +0100
commit0a1d8ac77a21ae0741bdf4af08f3a71354805ff1 (patch)
tree618f16fec40f4b56ae2550b930d5f3935495c9dd /units
parent0c14c45e5c00bbaed81566ace8f0d0c70cfe6392 (diff)
downloadsystemd-0a1d8ac77a21ae0741bdf4af08f3a71354805ff1.tar.gz
stub: handle random seed like sd-boot does
sd-stub has an opportunity to handle the seed the same way sd-boot does, which would have benefits for UKIs when sd-boot is not in use. This commit wires that up. It refactors the XBOOTLDR partition discovery to also find the ESP partition, so that it access the random seed there.
Diffstat (limited to 'units')
-rw-r--r--units/systemd-boot-system-token.service3
1 files changed, 2 insertions, 1 deletions
diff --git a/units/systemd-boot-system-token.service b/units/systemd-boot-system-token.service
index 689b902000..63e523bb3e 100644
--- a/units/systemd-boot-system-token.service
+++ b/units/systemd-boot-system-token.service
@@ -17,7 +17,8 @@ Conflicts=shutdown.target initrd-switch-root.target
Before=shutdown.target initrd-switch-root.target
# Only run this if the boot loader can support random seed initialization.
-ConditionPathExists=/sys/firmware/efi/efivars/LoaderFeatures-4a67b082-0a4c-41cf-b6c7-440b29bb8c4f
+ConditionPathExists|=/sys/firmware/efi/efivars/LoaderFeatures-4a67b082-0a4c-41cf-b6c7-440b29bb8c4f
+ConditionPathExists|=/sys/firmware/efi/efivars/StubFeatures-4a67b082-0a4c-41cf-b6c7-440b29bb8c4f
# Only run this if there is no system token defined yet
ConditionPathExists=!/sys/firmware/efi/efivars/LoaderSystemToken-4a67b082-0a4c-41cf-b6c7-440b29bb8c4f