diff --git a/SOURCES/dracut-module-setup.sh b/SOURCES/dracut-module-setup.sh index 0cf35a8..1fa3011 100755 --- a/SOURCES/dracut-module-setup.sh +++ b/SOURCES/dracut-module-setup.sh @@ -108,6 +108,17 @@ source_ifcfg_file() { fi } +add_dns_netdev() { + local _server _route + + _server=$1 + _route=`/sbin/ip -o route get to $_server 2>&1` + [ $? != 0 ] && echo "DNS server $_server unreachable" + + _netdev=$(get_ip_route_field "$_route" "dev") + _save_kdump_netifs "$_netdev" "$(kdump_setup_ifname $_netdev)" +} + # $1: netdev name kdump_setup_dns() { local _nameserver _dns @@ -115,8 +126,8 @@ kdump_setup_dns() { source_ifcfg_file $1 - [ -n "$DNS1" ] && echo "nameserver=$DNS1" > "$_dnsfile" - [ -n "$DNS2" ] && echo "nameserver=$DNS2" >> "$_dnsfile" + [ -n "$DNS1" ] && echo "nameserver=$DNS1" > "$_dnsfile" && add_dns_netdev "$DNS1" + [ -n "$DNS2" ] && echo "nameserver=$DNS2" >> "$_dnsfile" && add_dns_netdev "$DNS2" while read content; do @@ -128,6 +139,7 @@ kdump_setup_dns() { if [ ! -f $_dnsfile ] || [ ! $(cat $_dnsfile | grep -q $_dns) ]; then echo "nameserver=$_dns" >> "$_dnsfile" + add_dns_netdev "$_dns" fi done < "/etc/resolv.conf" } diff --git a/SOURCES/mkdumprd b/SOURCES/mkdumprd index f5bfd65..e5c6e06 100644 --- a/SOURCES/mkdumprd +++ b/SOURCES/mkdumprd @@ -442,7 +442,11 @@ if ! is_fadump_capable; then # so it doesn't affect the logic of check_dump_fs_modified(). is_dump_to_rootfs && add_mount "$(to_dev_name $(get_root_fs_device))" - add_dracut_arg "--no-hostonly-default-device" + add_dracut_arg "--no-hostonly-default-device" + + if fips-mode-setup --is-enabled 2> /dev/null; then + add_dracut_arg --add-device "$(findmnt -n -o SOURCE --target /boot)" + fi fi echo "$dracut_args $@" | xargs dracut diff --git a/SPECS/kexec-tools.spec b/SPECS/kexec-tools.spec index 37cac55..3687177 100644 --- a/SPECS/kexec-tools.spec +++ b/SPECS/kexec-tools.spec @@ -1,6 +1,6 @@ Name: kexec-tools Version: 2.0.26 -Release: 7%{?dist} +Release: 8%{?dist} License: GPLv2 Group: Applications/System Summary: The kexec/kdump userspace component @@ -396,6 +396,11 @@ done %endif %changelog +* Thu Aug 10 2023 Pingfan Liu - 2.0.26-8 +- mkdumprd: Use the correct syntax to redirect the stderr to null +- mkdumprd: call dracut with --add-device to install the drivers needed by /boot partition automatically for FIPS +- Add NICs that handle DNS queries to the allowlist + * Wed Jul 12 2023 Pingfan Liu - 2.0.26-7 - Revert "Revert "Append both nofail and x-systemd.before to kdump mount target"