diff options
Diffstat (limited to 'units')
-rw-r--r-- | units/meson.build | 2 | ||||
-rw-r--r-- | units/systemd-boot-random-seed.service | 15 | ||||
-rw-r--r-- | units/systemd-boot-update.service | 3 | ||||
-rw-r--r-- | units/systemd-random-seed.service.in | 4 |
4 files changed, 13 insertions, 11 deletions
diff --git a/units/meson.build b/units/meson.build index 25e9209b4d..79e2935a50 100644 --- a/units/meson.build +++ b/units/meson.build @@ -105,7 +105,7 @@ units = [ ['systemd-ask-password-wall.path', '', 'multi-user.target.wants/'], ['systemd-ask-password-wall.service', ''], - ['systemd-boot-system-token.service', 'HAVE_GNU_EFI', + ['systemd-boot-random-seed.service', 'HAVE_GNU_EFI', 'sysinit.target.wants/'], ['systemd-boot-update.service', 'HAVE_GNU_EFI'], ['systemd-coredump.socket', 'ENABLE_COREDUMP', diff --git a/units/systemd-boot-random-seed.service b/units/systemd-boot-random-seed.service index ef5577549e..4fa286071d 100644 --- a/units/systemd-boot-random-seed.service +++ b/units/systemd-boot-random-seed.service @@ -8,22 +8,21 @@ # (at your option) any later version. [Unit] -Description=Store a System Token in an EFI Variable -Documentation=man:systemd-boot-system-token.service(8) +Description=Update Boot Loader Random Seed +Documentation=man:systemd-boot-random-seed.service(8) man:random(4) DefaultDependencies=no After=local-fs.target systemd-random-seed.service -Conflicts=shutdown.target initrd-switch-root.target -Before=shutdown.target initrd-switch-root.target +Conflicts=shutdown.target +Before=sysinit.target shutdown.target +ConditionVirtualization=!container +ConditionPathExists=!/etc/initrd-release # 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/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 - [Service] Type=oneshot RemainAfterExit=yes -ExecStart=bootctl random-seed --graceful +ExecStart=bootctl --graceful random-seed diff --git a/units/systemd-boot-update.service b/units/systemd-boot-update.service index 61ff12762a..fe63fde35a 100644 --- a/units/systemd-boot-update.service +++ b/units/systemd-boot-update.service @@ -10,9 +10,10 @@ [Unit] Description=Automatic Boot Loader Update Documentation=man:bootctl(1) + DefaultDependencies=no -Conflicts=shutdown.target After=local-fs.target +Conflicts=shutdown.target Before=sysinit.target shutdown.target systemd-update-done.service [Service] diff --git a/units/systemd-random-seed.service.in b/units/systemd-random-seed.service.in index 1aa9af9710..d57b2d1269 100644 --- a/units/systemd-random-seed.service.in +++ b/units/systemd-random-seed.service.in @@ -8,14 +8,16 @@ # (at your option) any later version. [Unit] -Description=Load/Save Random Seed +Description=Load/Save OS Random Seed Documentation=man:systemd-random-seed.service(8) man:random(4) + DefaultDependencies=no RequiresMountsFor={{RANDOM_SEED}} Conflicts=shutdown.target After=systemd-remount-fs.service Before=first-boot-complete.target shutdown.target Wants=first-boot-complete.target + ConditionVirtualization=!container ConditionPathExists=!/etc/initrd-release |