rpms/kexec-tools
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Make dracut-squash a weak dep

Browse Source 
The dracut module is opportunistic about using the built-in squashfs
support only when available, but the spec file hard requires it. Demote
it to a weak dep to truly make it optional.

This caters to environments which strive to stay minimal, like FCOS and
RHCOS. See https://github.com/coreos/fedora-coreos-config/pull/708 for
details.
This commit is contained in:
Jonathan Lebon 2020-10-27 10:46:50 -04:00
parent f8f8d79d7f
commit c9a0df1ccb
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dracut-module-setup.sh
View File

@ -28,6 +28,9 @@ 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

2
kexec-tools.spec
View File

@ -58,7 +58,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
Requires: dracut-squash >= 050 Recommends: dracut-squash >= 050
Requires: ethtool Requires: ethtool
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
BuildRequires: pkgconfig intltool gettext BuildRequires: pkgconfig intltool gettext