From 325662490fea5251949531336fc979467a6b1dc1 Mon Sep 17 00:00:00 2001 From: Tao Liu Date: Fri, 14 May 2021 11:29:52 +0800 Subject: [PATCH] Make dracut-squash required for kexec-tools Resolves: bz1947928 Upstream: fedora Conflict: none commit 475e33030b680143972d8de3273e648cae8372d8 Author: Tao Liu Date: Sun Apr 25 17:05:42 2021 +0800 Make dracut-squash required for kexec-tools 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.org/message/SJX7CW3WLOYSFI2YJKGTUGDBWSCMZXVZ/ [2] https://www.spinics.net/lists/systemd-devel/msg05864.html Signed-off-by: Tao Liu Acked-by: Kairui Song Signed-off-by: Tao Liu --- 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 cc7e94e..09ac8cd 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 e68890d..bcc7f4c 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 BuildRequires: make BuildRequires: zlib-devel elfutils-devel glib2-devel bzip2-devel ncurses-devel bison flex lzo-devel snappy-devel