From f92a246e53de88a346a2fb6dc770a624f0660bef Mon Sep 17 00:00:00 2001
From: Dan Streetman <ddstreet@canonical.com>
Date: Thu, 22 Aug 2019 15:59:00 -0400
Subject: [PATCH] d/haveged.service: do not order
 After=systemd-random-seed.service

Commit 6e04e09636e42deb0255c83d3d57f8d6e342dedb added systemd service file
ordering to start haveged early during boot.  These changes to the service
file were not included in the systemd service files that upstream haveged
provides, and are used only by debian/ubuntu and opensuse.

Upstream systemd has recently changed systemd-random-seed.serivce to no longer
be ordered before sysinit.target:
https://github.com/systemd/systemd/commit/60ab2d1a4b3b927ad4536d0d8fb4609fb4053d62

However, since haveged orders itself After=systemd-random-seed and also
Before=sysinit.service, it is now causing boot delays:
https://github.com/systemd/systemd/issues/13252

This commit leaves all the early-boot ordering, except ordering after
systemd-random-seed.service, which is what was causing the boot delays.
---
 debian/haveged.service | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/haveged.service b/debian/haveged.service
index cad75ea..5a163c6 100644
--- a/debian/haveged.service
+++ b/debian/haveged.service
@@ -3,7 +3,7 @@ Description=Entropy daemon using the HAVEGE algorithm
 Documentation=man:haveged(8) http://www.issihosts.com/haveged/
 DefaultDependencies=no
 ConditionVirtualization=!container
-After=apparmor.service systemd-random-seed.service systemd-tmpfiles-setup.service
+After=apparmor.service systemd-tmpfiles-setup.service
 Before=sysinit.target shutdown.target
 
 [Service]
-- 
GitLab