summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJirka Hladky <jhladky@redhat.com>2021-12-31 01:56:33 +0100
committerJirka Hladky <jhladky@redhat.com>2021-12-31 01:56:33 +0100
commit85066ba8695807ddf2547d8ddbdae218a76bfdfc (patch)
tree156c5dcb4ce826c13154ba834056dadee05ef4d5
parentUpdated configure script (diff)
downloadhaveged-85066ba8695807ddf2547d8ddbdae218a76bfdfc.tar.xz
haveged-85066ba8695807ddf2547d8ddbdae218a76bfdfc.zip
Revert "Revert "Updated systemd service files to not start haveged service on kernel 5.6 and newer""
This reverts commit f836b13a20ac6a36aa144c71ee50ac3495488976.
-rw-r--r--contrib/Fedora/haveged-switch-root.service1
-rw-r--r--contrib/Fedora/haveged.service1
-rw-r--r--contrib/SUSE/haveged-switch-root.service1
3 files changed, 3 insertions, 0 deletions
diff --git a/contrib/Fedora/haveged-switch-root.service b/contrib/Fedora/haveged-switch-root.service
index 8cc38cf..a3eb086 100644
--- a/contrib/Fedora/haveged-switch-root.service
+++ b/contrib/Fedora/haveged-switch-root.service
@@ -1,6 +1,7 @@
[Unit]
Description=Tell haveged about new root
DefaultDependencies=no
+ConditionKernelVersion=<5.6
ConditionPathExists=/etc/initrd-release
Before=initrd-switch-root.service
JoinsNamespaceOf=haveged.service
diff --git a/contrib/Fedora/haveged.service b/contrib/Fedora/haveged.service
index 0d1cfe1..c05dcba 100644
--- a/contrib/Fedora/haveged.service
+++ b/contrib/Fedora/haveged.service
@@ -2,6 +2,7 @@
Description=Entropy Daemon based on the HAVEGE algorithm
Documentation=man:haveged(8) http://www.issihosts.com/haveged/
DefaultDependencies=no
+ConditionKernelVersion=<5.6
After=systemd-tmpfiles-setup-dev.service
Before=sysinit.target shutdown.target systemd-journald.service
diff --git a/contrib/SUSE/haveged-switch-root.service b/contrib/SUSE/haveged-switch-root.service
index 9757da4..24b8649 100644
--- a/contrib/SUSE/haveged-switch-root.service
+++ b/contrib/SUSE/haveged-switch-root.service
@@ -1,6 +1,7 @@
[Unit]
Description=Tell haveged about new root
DefaultDependencies=no
+ConditionKernelVersion=<5.6
ConditionPathExists=/etc/initrd-release
Before=initrd-switch-root.service
JoinsNamespaceOf=haveged.service