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

Revert "get kdump ifname once in kdump_install_net"

Browse Source 
This reverts commit afda4f4961.
This commit is contained in:
Kairui Song 2021-04-28 15:00:12 +08:00
parent b0156e9b64
commit 8d0ef743e0
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
dracut-module-setup.sh
View File

@ -480,7 +480,7 @@ kdump_get_remote_ip()
# initramfs accessing giving destination # initramfs accessing giving destination
# $1: destination host # $1: destination host
kdump_install_net() { kdump_install_net() {
local _destaddr _srcaddr _route _netdev kdumpnic local _destaddr _srcaddr _route _netdev
local _static _proto _ip_conf _ip_opts _ifname_opts local _static _proto _ip_conf _ip_opts _ifname_opts
_destaddr=$(kdump_get_remote_ip $1) _destaddr=$(kdump_get_remote_ip $1)
@ -488,7 +488,6 @@ kdump_install_net() {
_srcaddr=$(kdump_get_ip_route_field "$_route" "src") _srcaddr=$(kdump_get_ip_route_field "$_route" "src")
_netdev=$(kdump_get_ip_route_field "$_route" "dev") _netdev=$(kdump_get_ip_route_field "$_route" "dev")
_netmac=$(kdump_get_mac_addr $_netdev) _netmac=$(kdump_get_mac_addr $_netdev)
kdumpnic=$(kdump_setup_ifname $_netdev)
if [ "$(uname -m)" = "s390x" ]; then if [ "$(uname -m)" = "s390x" ]; then
kdump_setup_znet $_netdev kdump_setup_znet $_netdev
@ -504,7 +503,7 @@ kdump_install_net() {
fi fi
_ip_conf="${initdir}/etc/cmdline.d/40ip.conf" _ip_conf="${initdir}/etc/cmdline.d/40ip.conf"
_ip_opts=" ip=${_static}$kdumpnic:${_proto}" _ip_opts=" ip=${_static}$(kdump_setup_ifname $_netdev):${_proto}"
# dracut doesn't allow duplicated configuration for same NIC, even they're exactly the same. # dracut doesn't allow duplicated configuration for same NIC, even they're exactly the same.
# so we have to avoid adding duplicates # so we have to avoid adding duplicates
@ -524,7 +523,7 @@ kdump_install_net() {
elif kdump_is_vlan "$_netdev"; then elif kdump_is_vlan "$_netdev"; then
kdump_setup_vlan "$_netdev" kdump_setup_vlan "$_netdev"
else else
_ifname_opts=" ifname=$kdumpnic:$_netmac" _ifname_opts=" ifname=$(kdump_setup_ifname $_netdev):$_netmac"
echo "$_ifname_opts" >> $_ip_conf echo "$_ifname_opts" >> $_ip_conf
fi fi
@ -544,8 +543,8 @@ kdump_install_net() {
# gateway. # gateway.
if [ ! -f ${initdir}/etc/cmdline.d/60kdumpnic.conf ] && if [ ! -f ${initdir}/etc/cmdline.d/60kdumpnic.conf ] &&
[ ! -f ${initdir}/etc/cmdline.d/70bootdev.conf ]; then [ ! -f ${initdir}/etc/cmdline.d/70bootdev.conf ]; then
echo "kdumpnic=$kdumpnic" > ${initdir}/etc/cmdline.d/60kdumpnic.conf echo "kdumpnic=$(kdump_setup_ifname $_netdev)" > ${initdir}/etc/cmdline.d/60kdumpnic.conf
echo "bootdev=$kdumpnic" > ${initdir}/etc/cmdline.d/70bootdev.conf echo "bootdev=$(kdump_setup_ifname $_netdev)" > ${initdir}/etc/cmdline.d/70bootdev.conf
fi fi
} }