Make dracut-squash required for kexec-tools

Resolves: bz1947928
Upstream: fedora
Conflict: none

commit 475e33030b
Author: Tao Liu <ltao@redhat.com>
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 <ltao@redhat.com>
    Acked-by: Kairui Song <kasong@redhat.com>

Signed-off-by: Tao Liu <ltao@redhat.com>
This commit is contained in:
Tao Liu 2021-05-14 11:29:52 +08:00
parent 134a7686ed
commit 325662490f
2 changed files with 1 additions and 4 deletions

View File

@ -35,9 +35,6 @@ depends() {
modprobe -S $KDUMP_KERNELVER --dry-run $kmodule &>/dev/null || return 1 modprobe -S $KDUMP_KERNELVER --dry-run $kmodule &>/dev/null || return 1
fi fi
done done
# check that the dracut squash module is available
[ -d "$(dracut_module_path squash)" ] || return 1
} }
if is_squash_available && ! is_fadump_capable; then if is_squash_available && ! is_fadump_capable; then

View File

@ -61,7 +61,7 @@ Requires(postun): systemd-units
Requires(pre): coreutils sed zlib Requires(pre): coreutils sed zlib
Requires: dracut >= 050 Requires: dracut >= 050
Requires: dracut-network >= 050 Requires: dracut-network >= 050
Recommends: dracut-squash >= 050 Requires: dracut-squash >= 050
Requires: ethtool Requires: ethtool
BuildRequires: make BuildRequires: make
BuildRequires: zlib-devel elfutils-devel glib2-devel bzip2-devel ncurses-devel bison flex lzo-devel snappy-devel BuildRequires: zlib-devel elfutils-devel glib2-devel bzip2-devel ncurses-devel bison flex lzo-devel snappy-devel