rdrand-rng uses x86 hardware features (RDRAND/RDSEED instructions), so
auto-load this module during boot only on x86. This will help fix a
warning when booting on aarch64.
Change-Id: I6d4a0e7c92ea8a93ee11f019b23b7b5a18f118fc
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/5994
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Alexey Makhalov <amakhalov@vmware.com>
| ... | ... |
@@ -1,7 +1,7 @@ |
| 1 | 1 |
Summary: Systemd-239 |
| 2 | 2 |
Name: systemd |
| 3 | 3 |
Version: 239 |
| 4 |
-Release: 5%{?dist}
|
|
| 4 |
+Release: 6%{?dist}
|
|
| 5 | 5 |
License: LGPLv2+ and GPLv2+ and MIT |
| 6 | 6 |
URL: http://www.freedesktop.org/wiki/Software/systemd/ |
| 7 | 7 |
Group: System Environment/Security |
| ... | ... |
@@ -140,7 +140,9 @@ rm %{buildroot}/lib/systemd/system/default.target
|
| 140 | 140 |
ln -sfv multi-user.target %{buildroot}/lib/systemd/system/default.target
|
| 141 | 141 |
install -dm 0755 %{buildroot}/%{_sysconfdir}/systemd/network
|
| 142 | 142 |
install -m 0644 %{SOURCE4} %{buildroot}/%{_sysconfdir}/systemd/network
|
| 143 |
+%ifarch x86_64 |
|
| 143 | 144 |
install -m 0644 %{SOURCE5} %{buildroot}%{_sysconfdir}/modules-load.d
|
| 145 |
+%endif |
|
| 144 | 146 |
%find_lang %{name} ../%{name}.lang
|
| 145 | 147 |
|
| 146 | 148 |
%post |
| ... | ... |
@@ -181,7 +183,9 @@ rm -rf %{buildroot}/*
|
| 181 | 181 |
%config(noreplace) %{_sysconfdir}/systemd/coredump.conf
|
| 182 | 182 |
%config(noreplace) %{_sysconfdir}/systemd/timesyncd.conf
|
| 183 | 183 |
%config(noreplace) %{_sysconfdir}/pam.d/systemd-user
|
| 184 |
+%ifarch x86_64 |
|
| 184 | 185 |
%config(noreplace) %{_sysconfdir}/modules-load.d/10-rdrand-rng.conf
|
| 186 |
+%endif |
|
| 185 | 187 |
%config(noreplace) %{_sysconfdir}/systemd/network/99-dhcp-en.network
|
| 186 | 188 |
|
| 187 | 189 |
%dir %{_sysconfdir}/udev
|
| ... | ... |
@@ -246,6 +250,8 @@ rm -rf %{buildroot}/*
|
| 246 | 246 |
%files lang -f %{name}.lang
|
| 247 | 247 |
|
| 248 | 248 |
%changelog |
| 249 |
+* Fri Oct 26 2018 Srivatsa S. Bhat (VMware) <srivatsa@csail.mit.edu> 239-6 |
|
| 250 |
+- Auto-load rdrand-rng kernel module only on x86. |
|
| 249 | 251 |
* Fri Oct 26 2018 Anish Swaminathan <anishs@vmware.com> 239-5 |
| 250 | 252 |
- Revert the commit that causes GCE networkd timeout |
| 251 | 253 |
- https://github.com/systemd/systemd/commit/44b598a1c9d11c23420a5ef45ff11bcb0ed195eb |