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

Set up bond cmdline by "nmcli --get-values" 

Resolves: bz1919052
Upstream: Fedora
Conflict: None

commit d5f6d38173
Author: Coiby Xu <coxu@redhat.com>
Date:   Thu Apr 1 15:32:13 2021 +0800

    Set up bond cmdline by "nmcli --get-values"

    Now kdumpctl will exit if failing to set up bond cmdline.

    Signed-off-by: Coiby Xu <coxu@redhat.com>
    Acked-by: Kairui Song <kasong@redhat.com>

Signed-off-by: Coiby Xu <coxu@redhat.com>
This commit is contained in:
Coiby Xu 2021-05-14 09:30:08 +08:00 committed by Tao Liu
parent f0694987e8
commit c23189119b
1 changed files with 31 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
dracut-module-setup.sh
View File

@ -368,7 +368,10 @@ kdump_setup_bridge() {
for _dev in `ls /sys/class/net/$_netdev/brif/`; do for _dev in `ls /sys/class/net/$_netdev/brif/`; do
_kdumpdev=$_dev _kdumpdev=$_dev
if kdump_is_bond "$_dev"; then if kdump_is_bond "$_dev"; then
kdump_setup_bond "$_dev" $(kdump_setup_bond "$_dev" "$(get_nmcli_connection_show_cmd_by_ifname "$_dev")")
if [[ $? != 0 ]]; then
exit 1
fi
elif kdump_is_team "$_dev"; then elif kdump_is_team "$_dev"; then
kdump_setup_team "$_dev" kdump_setup_team "$_dev"
elif kdump_is_vlan "$_dev"; then elif kdump_is_vlan "$_dev"; then
@ -383,9 +386,13 @@ kdump_setup_bridge() {
echo " bridge=$_netdev:$(echo $_brif | sed -e 's/,$//')" >> ${initdir}/etc/cmdline.d/41bridge.conf echo " bridge=$_netdev:$(echo $_brif | sed -e 's/,$//')" >> ${initdir}/etc/cmdline.d/41bridge.conf
} }
# drauct takes bond=<bondname>[:<bondslaves>:[:<options>]] syntax to parse
# bond. For example:
# bond=bond0:eth0,eth1:mode=balance-rr
kdump_setup_bond() { kdump_setup_bond() {
local _netdev=$1 local _netdev="$1"
local _dev _mac _slaves _kdumpdev local _nm_show_cmd="$2"
local _dev _mac _slaves _kdumpdev _bondoptions
for _dev in `cat /sys/class/net/$_netdev/bonding/slaves`; do for _dev in `cat /sys/class/net/$_netdev/bonding/slaves`; do
_mac=$(kdump_get_perm_addr $_dev) _mac=$(kdump_get_perm_addr $_dev)
_kdumpdev=$(kdump_setup_ifname $_dev) _kdumpdev=$(kdump_setup_ifname $_dev)
@ -393,12 +400,21 @@ kdump_setup_bond() {
_slaves+="$_kdumpdev," _slaves+="$_kdumpdev,"
done done
echo -n " bond=$_netdev:$(echo $_slaves | sed 's/,$//')" >> ${initdir}/etc/cmdline.d/42bond.conf echo -n " bond=$_netdev:$(echo $_slaves | sed 's/,$//')" >> ${initdir}/etc/cmdline.d/42bond.conf
# Get bond options specified in ifcfg
source_ifcfg_file $_netdev _bondoptions=$(get_nmcli_value_by_field "$_nm_show_cmd" "bond.options")
bondoptions=":$(echo $BONDING_OPTS | xargs echo | tr " " ",")" if [[ -z "_bondoptions" ]]; then
echo "$bondoptions" >> ${initdir}/etc/cmdline.d/42bond.conf dwarning "Failed to get bond configuration via nmlci output. Now try sourcing ifcfg script."
source_ifcfg_file $_netdev
_bondoptions="$(echo $BONDING_OPTS | xargs echo | tr " " ",")"
fi
if [[ -z "_bondoptions" ]]; then
derror "Get empty bond options"
exit 1
fi
echo ":$_bondoptions" >> ${initdir}/etc/cmdline.d/42bond.conf
} }
kdump_setup_team() { kdump_setup_team() {
@ -435,7 +451,10 @@ kdump_setup_vlan() {
derror "Vlan over bridge is not supported!" derror "Vlan over bridge is not supported!"
exit 1 exit 1
elif kdump_is_bond "$_phydev"; then elif kdump_is_bond "$_phydev"; then
kdump_setup_bond "$_phydev" $(kdump_setup_bond "$_phydev" "$(get_nmcli_connection_show_cmd_by_ifname "$_phydev")")
if [[ $? != 0 ]]; then
exit 1
fi
echo " vlan=$(kdump_setup_ifname $_netdev):$_phydev" > ${initdir}/etc/cmdline.d/43vlan.conf echo " vlan=$(kdump_setup_ifname $_netdev):$_phydev" > ${initdir}/etc/cmdline.d/43vlan.conf
else else
_kdumpdev="$(kdump_setup_ifname $_phydev)" _kdumpdev="$(kdump_setup_ifname $_phydev)"
@ -547,7 +566,10 @@ kdump_install_net() {
if kdump_is_bridge "$_netdev"; then if kdump_is_bridge "$_netdev"; then
kdump_setup_bridge "$_netdev" kdump_setup_bridge "$_netdev"
elif kdump_is_bond "$_netdev"; then elif kdump_is_bond "$_netdev"; then
kdump_setup_bond "$_netdev" $(kdump_setup_bond "$_netdev" "$_nm_show_cmd")
if [[ $? != 0 ]]; then
exit 1
fi
elif kdump_is_team "$_netdev"; then elif kdump_is_team "$_netdev"; then
kdump_setup_team "$_netdev" kdump_setup_team "$_netdev"
elif kdump_is_vlan "$_netdev"; then elif kdump_is_vlan "$_netdev"; then