From 36ea9f1d4150d0d8b100f7007f223d64611c01a6 Mon Sep 17 00:00:00 2001 From: markeryang Date: Tue, 7 Dec 2021 22:47:25 +0800 Subject: [PATCH] Fix initramfs creating by forcing installation of libnvdimm.ko (cherry picked from commit b0b3ac6118893a82b458a1f19b3a76f191b59830) --- dracut-nvdimm-security.conf | 3 +++ ndctl.spec | 8 +++++++- 2 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 dracut-nvdimm-security.conf diff --git a/dracut-nvdimm-security.conf b/dracut-nvdimm-security.conf new file mode 100644 index 0000000..fa83ad1 --- /dev/null +++ b/dracut-nvdimm-security.conf @@ -0,0 +1,3 @@ +# Make sure libnvdimm is loaded and ndctl is available in the initramfs +install_items+="/bin/ndctl" +add_drivers+=" libnvdimm " diff --git a/ndctl.spec b/ndctl.spec index 8956f89..fc30841 100644 --- a/ndctl.spec +++ b/ndctl.spec @@ -1,11 +1,12 @@ Name: ndctl Version: 68 -Release: 1 +Release: 2 Summary: Manage "libnvdimm" subsystem devices (Non-volatile Memory) License: GPLv2 Group: System Environment/Base Url: https://github.com/pmem/ndctl Source0: https://github.com/pmem/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz +Source1: dracut-nvdimm-security.conf Requires: ndctl-libs%{?_isa} = %{version}-%{release} Requires: daxctl-libs%{?_isa} = %{version}-%{release} @@ -98,6 +99,7 @@ make %{?_smp_mflags} %install %make_install find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' +install -Dp -m 0644 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/dracut.conf.d/nvdimm-security.conf %check make check @@ -121,6 +123,7 @@ make check %{_unitdir}/ndctl-monitor.service %{_sysconfdir}/ndctl/keys/keys.readme %{_sysconfdir}/modprobe.d/nvdimm-security.conf +%{_sysconfdir}/dracut.conf.d/nvdimm-security.conf %files -n daxctl %license util/COPYING licenses/BSD-MIT licenses/CC0 @@ -152,6 +155,9 @@ make check %changelog +* Tue Dec 7 2021 yanglongkang - 68-2 +- Fix initramfs creating by forcing installation of libnvdimm.ko + * Thu Aug 20 2020 Zhiqiang Liu - 68-1 - update version 68 -- Gitee