Fix a lock up in a container due to udevadm call
Adjust rngd-wake-threshold.service and post section so udevadm is not run in a container. Resolves: rhbz#1975588 Signed-off-by: Vladis Dronov <vdronov@redhat.com>
This commit is contained in:
parent
08cfd8d97d
commit
0e48f2301e
@ -1,5 +1,6 @@
|
|||||||
%global _hardened_build 1
|
%global _hardened_build 1
|
||||||
|
|
||||||
|
# this is a correct if, bcond_with actually means without and vice versa
|
||||||
%if 0%{?rhel} && 0%{?rhel} >= 9
|
%if 0%{?rhel} && 0%{?rhel} >= 9
|
||||||
%bcond_with pkcs11
|
%bcond_with pkcs11
|
||||||
%bcond_with rtlsdr
|
%bcond_with rtlsdr
|
||||||
@ -11,7 +12,7 @@
|
|||||||
Summary: Random number generator related utilities
|
Summary: Random number generator related utilities
|
||||||
Name: rng-tools
|
Name: rng-tools
|
||||||
Version: 6.13
|
Version: 6.13
|
||||||
Release: 2%{?dist}
|
Release: 3%{?dist}
|
||||||
License: GPLv2+
|
License: GPLv2+
|
||||||
URL: https://github.com/nhorman/rng-tools
|
URL: https://github.com/nhorman/rng-tools
|
||||||
Source0: https://github.com/nhorman/rng-tools/archive/v%{version}/rng-tools-%{version}.tar.gz
|
Source0: https://github.com/nhorman/rng-tools/archive/v%{version}/rng-tools-%{version}.tar.gz
|
||||||
@ -78,7 +79,7 @@ getent passwd rngd >/dev/null || useradd -r -M -d %{_localstatedir}/lib/rngd -s
|
|||||||
|
|
||||||
%post
|
%post
|
||||||
%systemd_post rngd.service rngd-wake-threshold.service
|
%systemd_post rngd.service rngd-wake-threshold.service
|
||||||
udevadm trigger --sysname-match=hw_random --settle
|
/usr/bin/systemctl start rngd-wake-threshold.service || :
|
||||||
|
|
||||||
%preun
|
%preun
|
||||||
%systemd_preun rngd.service rngd-wake-threshold.service
|
%systemd_preun rngd.service rngd-wake-threshold.service
|
||||||
@ -99,6 +100,10 @@ udevadm trigger --sysname-match=hw_random --settle
|
|||||||
%attr(0644,root,root) %{_udevrulesdir}/60-hwrng.rules
|
%attr(0644,root,root) %{_udevrulesdir}/60-hwrng.rules
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Jul 05 2021 Vladis Dronov <vdronov@redhat.com> - 6.13-3
|
||||||
|
- Adjust rngd-wake-threshold.service and post section so udevadm
|
||||||
|
is not run in a container (bz 1965318)
|
||||||
|
|
||||||
* Thu Jun 17 2021 Mohan Boddu <mboddu@redhat.com> - 6.13-2
|
* Thu Jun 17 2021 Mohan Boddu <mboddu@redhat.com> - 6.13-2
|
||||||
- Specbump for openssl 3.0
|
- Specbump for openssl 3.0
|
||||||
Related: rhbz#1971065
|
Related: rhbz#1971065
|
||||||
@ -118,17 +123,21 @@ udevadm trigger --sysname-match=hw_random --settle
|
|||||||
- Add 3 small upstream patches fixing issues
|
- Add 3 small upstream patches fixing issues
|
||||||
|
|
||||||
* Wed Apr 28 2021 Vladis Dronov <vdronov@redhat.com> - 6.12-3
|
* Wed Apr 28 2021 Vladis Dronov <vdronov@redhat.com> - 6.12-3
|
||||||
- There is no need to hardcode _sbindir anymore, also the old value is incorrect (bz 1965318)
|
- There is no need to hardcode _sbindir anymore, also the old
|
||||||
|
value is incorrect (bz 1965318)
|
||||||
|
|
||||||
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 6.12-2
|
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 6.12-2
|
||||||
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
|
- Rebuilt for RHEL 9 BETA on Apr 15th 2021.
|
||||||
|
Related: rhbz#1947937
|
||||||
|
|
||||||
* Fri Mar 12 2021 Vladis Dronov <vdronov@redhat.com> - 6.12-1
|
* Fri Mar 12 2021 Vladis Dronov <vdronov@redhat.com> - 6.12-1
|
||||||
- Update to 6.12
|
- Update to 6.12
|
||||||
- Drop libsysfs dependency since it is not used anymore
|
- Drop libsysfs dependency since it is not used anymore
|
||||||
- Remove jitterentropy-remove-install.patch since we depend on a system jitterentropy library now
|
- Remove jitterentropy-remove-install.patch since we depend on
|
||||||
|
a system jitterentropy library now
|
||||||
- Remove rngd-shutdown.patch since it is the upstream commit 62fbff0a
|
- Remove rngd-shutdown.patch since it is the upstream commit 62fbff0a
|
||||||
- Remove rngd-exit-code-for-list.patch since it is the upstream commit fb46dc48
|
- Remove rngd-exit-code-for-list.patch since it is the upstream commit
|
||||||
|
fb46dc48
|
||||||
- Remove pkcs11-path.patch since it is the upstream commit 1993eca9
|
- Remove pkcs11-path.patch since it is the upstream commit 1993eca9
|
||||||
|
|
||||||
* Tue Mar 02 2021 Vladis Dronov <vdronov@redhat.com> - 6.11-3
|
* Tue Mar 02 2021 Vladis Dronov <vdronov@redhat.com> - 6.11-3
|
||||||
@ -294,4 +303,3 @@ udevadm trigger --sysname-match=hw_random --settle
|
|||||||
|
|
||||||
* Wed Mar 24 2010 Jeff Garzik <jgarzik@redhat.com> - 2-1
|
* Wed Mar 24 2010 Jeff Garzik <jgarzik@redhat.com> - 2-1
|
||||||
- initial revision (as rng-tools)
|
- initial revision (as rng-tools)
|
||||||
|
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
[Unit]
|
[Unit]
|
||||||
Description=Hardware RNG Entropy Gatherer Wake threshold service
|
Description=Hardware RNG Entropy Gatherer Wake threshold service
|
||||||
|
ConditionVirtualization=!container
|
||||||
Before=rngd.service
|
Before=rngd.service
|
||||||
|
|
||||||
[Service]
|
[Service]
|
||||||
|
Loading…
Reference in New Issue
Block a user