60 lines
1.9 KiB
Diff
60 lines
1.9 KiB
Diff
|
From 68814ff425e71c411ba5111c37774cbab429bf9e Mon Sep 17 00:00:00 2001
|
||
|
|
From: Pavel Valena <pvalena@redhat.com>
|
||
|
|
Date: Sun, 23 Jul 2023 19:44:17 +0200
|
||
|
|
Subject: [PATCH] fix(rngd): install system service file
|
||
|
|
|
||
|
|
as there's no reason to keep a copy; there shouldn't be any modifications.
|
||
|
|
|
||
|
|
In case there are args stored in a separate file (Fedora and alike),
|
||
|
|
it needs to be supplied too, but without the option to change the user.
|
||
|
|
|
||
|
|
(Cherry-picked commit: c47a44cb25c0892d9af6e66ee9d7cd2c3beca31f)
|
||
|
|
|
||
|
|
Resolves: #2181541
|
||
|
|
---
|
||
|
|
modules.d/06rngd/module-setup.sh | 7 ++++++-
|
||
|
|
modules.d/06rngd/rngd.service | 8 --------
|
||
|
|
modules.d/06rngd/sysconfig | 1 +
|
||
|
|
3 files changed, 7 insertions(+), 9 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/modules.d/06rngd/module-setup.sh b/modules.d/06rngd/module-setup.sh
|
||
|
|
index d94a47af..66923a38 100644
|
||
|
|
--- a/modules.d/06rngd/module-setup.sh
|
||
|
|
+++ b/modules.d/06rngd/module-setup.sh
|
||
|
|
@@ -32,7 +32,12 @@ depends() {
|
||
|
|
|
||
|
|
install() {
|
||
|
|
inst rngd
|
||
|
|
- inst_simple "${moddir}/rngd.service" "${systemdsystemunitdir}/rngd.service"
|
||
|
|
+ inst_simple "${systemdsystemunitdir}/rngd.service"
|
||
|
|
+
|
||
|
|
+ if [ -r /etc/sysconfig/rngd ]; then
|
||
|
|
+ inst_simple "${moddir}/sysconfig" "/etc/sysconfig/rngd"
|
||
|
|
+ fi
|
||
|
|
+
|
||
|
|
# make sure dependant libs are installed too
|
||
|
|
inst_libdir_file opensc-pkcs11.so
|
||
|
|
|
||
|
|
diff --git a/modules.d/06rngd/rngd.service b/modules.d/06rngd/rngd.service
|
||
|
|
deleted file mode 100644
|
||
|
|
index dd5374d7..00000000
|
||
|
|
--- a/modules.d/06rngd/rngd.service
|
||
|
|
+++ /dev/null
|
||
|
|
@@ -1,8 +0,0 @@
|
||
|
|
-[Unit]
|
||
|
|
-Description=Hardware RNG Entropy Gatherer Daemon
|
||
|
|
-DefaultDependencies=no
|
||
|
|
-Before=systemd-udevd.service
|
||
|
|
-ConditionVirtualization=!container
|
||
|
|
-
|
||
|
|
-[Service]
|
||
|
|
-ExecStart=/usr/sbin/rngd -f
|
||
|
|
diff --git a/modules.d/06rngd/sysconfig b/modules.d/06rngd/sysconfig
|
||
|
|
new file mode 100644
|
||
|
|
index 00000000..100e8deb
|
||
|
|
--- /dev/null
|
||
|
|
+++ b/modules.d/06rngd/sysconfig
|
||
|
|
@@ -0,0 +1 @@
|
||
|
|
+RNGD_ARGS="--fill-watermark=0 -x pkcs11 -x nist -x qrypt"
|
||
|
|
|