summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJirka Hladky <jhladky@redhat.com>2021-01-02 03:51:45 +0100
committerJirka Hladky <jhladky@redhat.com>2021-01-02 03:51:45 +0100
commit9ecb269c9c6f75cfef6de596e970389e607e64c6 (patch)
tree6b793719ad9362b5546ae08b29b673dc0af77054
parentPreparing v1.9.14 release (diff)
downloadhaveged-9ecb269c9c6f75cfef6de596e970389e607e64c6.tar.xz
haveged-9ecb269c9c6f75cfef6de596e970389e607e64c6.zip
Added udev rules
-rw-r--r--contrib/SUSE/90-haveged.rules5
-rw-r--r--contrib/build/fedora.spec11
2 files changed, 14 insertions, 2 deletions
diff --git a/contrib/SUSE/90-haveged.rules b/contrib/SUSE/90-haveged.rules
new file mode 100644
index 0000000..6b1c5cf
--- /dev/null
+++ b/contrib/SUSE/90-haveged.rules
@@ -0,0 +1,5 @@
+# Start the haveged service as soon as the random device is available
+# to avoid starting other services while starved of entropy
+
+ACTION=="add", KERNEL=="random" , SUBSYSTEM=="mem", TAG+="systemd", ENV{SYSTEMD_WANTS}+="haveged.service"
+
diff --git a/contrib/build/fedora.spec b/contrib/build/fedora.spec
index c3ef381..ebad58f 100644
--- a/contrib/build/fedora.spec
+++ b/contrib/build/fedora.spec
@@ -42,7 +42,7 @@ Headers and shared object symbolic links for the HAVEGE algorithm
%build
#autoreconf -fiv
-%configure --disable-enttest --enable-nistest
+%configure --disable-enttest --enable-nistest --disable-static
#SMP build is not working
#make %{?_smp_mflags}
make
@@ -60,7 +60,8 @@ chmod 0644 COPYING README ChangeLog AUTHORS
#Install systemd service file
sed -e 's:@SBIN_DIR@:%{_sbindir}:g' -i init.d/service.fedora
install -Dpm 0644 init.d/service.fedora %{buildroot}%{_unitdir}/%{name}.service
-install -Dpm 0755 contrib/SUSE/haveged-dracut.module %{buildroot}/lib/dracut/modules.d/98%{name}/module-setup.sh
+install -Dpm 0755 contrib/SUSE/haveged-dracut.module %{buildroot}/%{_libdir}/dracut/modules.d/98%{name}/module-setup.sh
+install -Dpm 0644 contrib/SUSE/90-haveged.rules %{buildroot}%{_udevrulesdir}/90-%{name}.rules
# We don't ship .la files.
rm -rf %{buildroot}%{_libdir}/libhavege.*a
@@ -108,6 +109,9 @@ fi
%{_unitdir}/haveged.service
%{_libdir}/*so.*
%{_defaultdocdir}/*
+%{_udevrulesdir}/*-%{name}.rules
+%dir %{_libdir}/dracut/modules.d/98%{name}
+%{_libdir}/dracut/modules.d/98%{name}/*
%files devel
%{_mandir}/man3/libhavege.3*
@@ -121,6 +125,9 @@ fi
* Sun Jun 28 2020 Jirka Hladky <hladky.jiri@gmail.com> - 1.9.14-1
- Update to 1.9.14
- BZ1835006 - Added dracut module
+ - Start the service as soon as the random device is available with
+ the help of udev, as starting services while starved of entropy
+ is no good.
* Sun Jun 28 2020 Jirka Hladky <hladky.jiri@gmail.com> - 1.9.13-1
- Update to 1.9.13