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

Set up s390 znet cmdline by "nmcli --get-values"

Browse Source 
Now kdumpctl will abort when failing to set up znet.

Signed-off-by: Coiby Xu <coxu@redhat.com>
Acked-by: Kairui Song <kasong@redhat.com>
This commit is contained in:
Coiby Xu 2021-04-01 15:32:11 +08:00 committed by Kairui Song
parent 0c292f49c7
commit 8b08b4f17b
1 changed files with 30 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
dracut-module-setup.sh
View File

@ -430,17 +430,33 @@ kdump_setup_vlan() {
} }
# setup s390 znet cmdline # setup s390 znet cmdline
# $1: netdev name # $1: netdev (ifname)
# $2: nmcli connection show output
kdump_setup_znet() { kdump_setup_znet() {
local _netdev="$1"
local _nmcli_cmd="$2"
local s390_prefix="802-3-ethernet.s390-"
local _options="" local _options=""
local _netdev=$1 local NETTYPE
local SUBCHANNELS
source_ifcfg_file $_netdev NETTYPE=$(get_nmcli_value_by_field "$_nmcli_cmd" "${s390_prefix}nettype")
SUBCHANNELS=$(get_nmcli_value_by_field "$_nmcli_cmd" "${s390_prefix}subchannels")
_options=$(get_nmcli_value_by_field "$_nmcli_cmd" "${s390_prefix}options")
for i in $OPTIONS; do if [[ -z "$NETTYPE" || -z "$SUBCHANNELS" || -z "$_options" ]]; then
_options=${_options},$i dwarning "Failed to get znet configuration via nmlci output. Now try sourcing ifcfg script."
done source_ifcfg_file $_netdev
echo rd.znet=${NETTYPE},${SUBCHANNELS}${_options} rd.znet_ifname=$_netdev:${SUBCHANNELS} > ${initdir}/etc/cmdline.d/30znet.conf for i in $OPTIONS; do
_options=${_options},$i
done
fi
if [[ -z "$NETTYPE" || -z "$SUBCHANNELS" || -z "$_options" ]]; then
exit 1
fi
echo rd.znet=${NETTYPE},${SUBCHANNELS},${_options} rd.znet_ifname=$_netdev:${SUBCHANNELS} > ${initdir}/etc/cmdline.d/30znet.conf
} }
kdump_get_ip_route() kdump_get_ip_route()
@ -477,18 +493,23 @@ 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 _nm_show_cmd kdumpnic
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)
_route=$(kdump_get_ip_route $_destaddr) _route=$(kdump_get_ip_route $_destaddr)
_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")
_nm_show_cmd=$(get_nmcli_connection_show_cmd_by_ifname "$_netdev")
_netmac=$(kdump_get_mac_addr $_netdev) _netmac=$(kdump_get_mac_addr $_netdev)
kdumpnic=$(kdump_setup_ifname $_netdev) kdumpnic=$(kdump_setup_ifname $_netdev)
if [ "$(uname -m)" = "s390x" ]; then if [ "$(uname -m)" = "s390x" ]; then
kdump_setup_znet $_netdev $(kdump_setup_znet "$_netdev" "$_nm_show_cmd")
if [[ $? != 0 ]]; then
derror "Failed to set up znet"
exit 1
fi
fi fi
_static=$(kdump_static_ip $_netdev $_srcaddr $kdumpnic) _static=$(kdump_static_ip $_netdev $_srcaddr $kdumpnic)