This patch reverts commit "Make dracut-squash a weak dep".
Although kexec-tools can work without dracut-squash, it is essential
for kdump to run properly in cases [1][2] where minimal amount of memory
consumption is expected. Thus dracut-squash is needed for it.
[1]
https://lists.fedoraproject.org/archives/list/kexec@lists.fedoraproject.o...
[2]
https://www.spinics.net/lists/systemd-devel/msg05864.html
Signed-off-by: Tao Liu <ltao(a)redhat.com>
---
dracut-module-setup.sh | 3 ---
kexec-tools.spec | 2 +-
2 files changed, 1 insertion(+), 4 deletions(-)
diff --git a/dracut-module-setup.sh b/dracut-module-setup.sh
index 21143b4..3a1cc2f 100755
--- a/dracut-module-setup.sh
+++ b/dracut-module-setup.sh
@@ -35,9 +35,6 @@ depends() {
modprobe -S $KDUMP_KERNELVER --dry-run $kmodule &>/dev/null ||
return 1
fi
done
-
- # check that the dracut squash module is available
- [ -d "$(dracut_module_path squash)" ] || return 1
}
if is_squash_available && ! is_fadump_capable; then
diff --git a/kexec-tools.spec b/kexec-tools.spec
index 88ba2bd..7a9949d 100644
--- a/kexec-tools.spec
+++ b/kexec-tools.spec
@@ -61,7 +61,7 @@ Requires(postun): systemd-units
Requires(pre): coreutils sed zlib
Requires: dracut >= 050
Requires: dracut-network >= 050
-Recommends: dracut-squash >= 050
+Requires: dracut-squash >= 050
Requires: ethtool
Requires: ipcalc
BuildRequires: make
--
2.29.2
_______________________________________________
kexec mailing list -- kexec(a)lists.fedoraproject.org
To unsubscribe send an email to kexec-leave(a)lists.fedoraproject.org
Fedora Code of Conduct:
https://docs.fedoraproject.org/en-US/project/code-of-conduct/
List Guidelines:
https://fedoraproject.org/wiki/Mailing_list_guidelines
List Archives:
https://lists.fedoraproject.org/archives/list/kexec@lists.fedoraproject.org
Do not reply to spam on the list, report it:
https://pagure.io/fedora-infrastructure
Looks good to me
Acked-by: Kairui Song <kasong(a)redhat.com>
--
Best Regards,
Kairui Song