Accepting request 335611 from home:msmeissn:branches:security
- modules-setup.sh should be module-setup.sh in dracut, also 755 - add dependency on systemd-journald.socket to make haveged really start before journald in the initrd. bsc#898669 OBS-URL: https://build.opensuse.org/request/show/335611 OBS-URL: https://build.opensuse.org/package/show/security/haveged?expand=0&rev=103
This commit is contained in:
parent
ffee4af437
commit
8af54b5cc8
@ -16,4 +16,6 @@ install() {
|
||||
inst_multiple -o \
|
||||
/usr/sbin/haveged \
|
||||
$systemdsystemunitdir/haveged.service
|
||||
mkdir "$initdir/$systemdsystemunitdir/systemd-journald.service.wants"
|
||||
ln_r "$systemdsystemunitdir/haveged.service" "$systemdsystemunitdir/systemd-journald.service.wants/haveged.service"
|
||||
}
|
||||
|
@ -1,3 +1,10 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Sep 30 12:15:14 UTC 2015 - meissner@suse.com
|
||||
|
||||
- modules-setup.sh should be module-setup.sh in dracut, also 755
|
||||
- add dependency on systemd-journald.socket to make haveged
|
||||
really start before journald in the initrd. bsc#898669
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Sep 29 12:30:21 UTC 2015 - dmueller@suse.com
|
||||
|
||||
|
@ -5,7 +5,7 @@ DefaultDependencies=no
|
||||
ConditionVirtualization=!container
|
||||
#Conflicts=shutdown.target
|
||||
After=systemd-random-seed.service
|
||||
Before=sysinit.target shutdown.target systemd-journald.service
|
||||
Before=sysinit.target shutdown.target systemd-journald.service systemd-journald.socket
|
||||
|
||||
[Service]
|
||||
ExecStart=/usr/sbin/haveged -w 1024 -v 0 -F
|
||||
|
@ -111,7 +111,7 @@ rm -f %{buildroot}%{_libdir}/libhavege.*a
|
||||
ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name}
|
||||
|
||||
install -d -m0755 %{buildroot}/usr/lib/dracut/modules.d/98haveged
|
||||
install -m0644 %{SOURCE4} %{buildroot}/usr/lib/dracut/modules.d/98haveged/modules-setup.sh
|
||||
install -m0755 %{SOURCE4} %{buildroot}/usr/lib/dracut/modules.d/98haveged/module-setup.sh
|
||||
|
||||
%post
|
||||
%{?udev_rules_update:%udev_rules_update}
|
||||
@ -146,7 +146,7 @@ install -m0644 %{SOURCE4} %{buildroot}/usr/lib/dracut/modules.d/98haveged/module
|
||||
%dir /usr/lib/dracut
|
||||
%dir /usr/lib/dracut/modules.d
|
||||
%dir /usr/lib/dracut/modules.d/98haveged
|
||||
/usr/lib/dracut/modules.d/98haveged/modules-setup.sh
|
||||
/usr/lib/dracut/modules.d/98haveged/module-setup.sh
|
||||
|
||||
%files devel
|
||||
%defattr(-,root,root)
|
||||
|
Loading…
Reference in New Issue
Block a user