42 lines
1.4 KiB
Diff
42 lines
1.4 KiB
Diff
|
From 4c75e51c585eebd9bc175920aa8c8b4afe808144 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Pavel Valena <pvalena@redhat.com>
|
||
|
|
Date: Wed, 20 Sep 2023 14:56:41 +0200
|
||
|
|
Subject: [PATCH] fix(dracut.spec): add jq dependency to network subpackage
|
||
|
|
|
||
|
|
and also move nvmf module to network subpackage.
|
||
|
|
|
||
|
|
Resolves: RHEL-15012
|
||
|
|
---
|
||
|
|
pkgbuild/dracut.spec | 3 ++-
|
||
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/pkgbuild/dracut.spec b/pkgbuild/dracut.spec
|
||
|
|
index 1996f44d..bd850986 100644
|
||
|
|
--- a/pkgbuild/dracut.spec
|
||
|
|
+++ b/pkgbuild/dracut.spec
|
||
|
|
@@ -111,6 +111,7 @@ Requires: %{name} = %{version}-%{release}
|
||
|
|
%endif
|
||
|
|
Requires: iputils
|
||
|
|
Requires: iproute
|
||
|
|
+Requires: jq
|
||
|
|
Requires: (NetworkManager >= 1.20 or dhclient)
|
||
|
|
Suggests: NetworkManager
|
||
|
|
Obsoletes: dracut-generic < 008
|
||
|
|
@@ -369,7 +370,6 @@ echo 'dracut_rescue_image="yes"' > $RPM_BUILD_ROOT%{dracutlibdir}/dracut.conf.d/
|
||
|
|
%{dracutlibdir}/modules.d/95fstab-sys
|
||
|
|
%{dracutlibdir}/modules.d/95hwdb
|
||
|
|
%{dracutlibdir}/modules.d/95lunmask
|
||
|
|
-%{dracutlibdir}/modules.d/95nvmf
|
||
|
|
%{dracutlibdir}/modules.d/95resume
|
||
|
|
%{dracutlibdir}/modules.d/95rootfs-block
|
||
|
|
%{dracutlibdir}/modules.d/95terminfo
|
||
|
|
@@ -441,6 +441,7 @@ echo 'dracut_rescue_image="yes"' > $RPM_BUILD_ROOT%{dracutlibdir}/dracut.conf.d/
|
||
|
|
%{dracutlibdir}/modules.d/95iscsi
|
||
|
|
%{dracutlibdir}/modules.d/95nbd
|
||
|
|
%{dracutlibdir}/modules.d/95nfs
|
||
|
|
+%{dracutlibdir}/modules.d/95nvmf
|
||
|
|
%{dracutlibdir}/modules.d/95ssh-client
|
||
|
|
%ifarch s390 s390x
|
||
|
|
%{dracutlibdir}/modules.d/95znet
|
||
|
|
|