From 5ed897754e7bcb18251129a564641443ba6d591b Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Mon, 12 Dec 2022 17:12:37 +0100 Subject: [PATCH] Resolves: #2125152, HNV bond fails to come up with sriov interface as active slave --- ...setting_primary_slave_across_reboots.patch | 27 +++++++++++++++++++ powerpc-utils.spec | 6 ++++- 2 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 powerpc-utils-fix_setting_primary_slave_across_reboots.patch diff --git a/powerpc-utils-fix_setting_primary_slave_across_reboots.patch b/powerpc-utils-fix_setting_primary_slave_across_reboots.patch new file mode 100644 index 0000000..8d22fc3 --- /dev/null +++ b/powerpc-utils-fix_setting_primary_slave_across_reboots.patch @@ -0,0 +1,27 @@ +commit acaf9c45a340f9bb49d6b21ba7ad60c21326ea73 +Author: Mingming Cao +Date: Mon Nov 7 14:39:02 2022 -0800 + + hcnmgr: Fix setting primary slave across reboots + + Using nmcli to set bonding of primary slave so that is set correctly + across reboots. + + Signed-off-by: Mingming Cao + [tyreld: Reworded commit log] + Signed-off-by: Tyrel Datwyler + +diff --git a/scripts/hcnmgr b/scripts/hcnmgr +index 6946ff9..b5a6bfb 100644 +--- a/scripts/hcnmgr ++++ b/scripts/hcnmgr +@@ -375,7 +375,8 @@ do_config_vdevice_nm() { + # if the device is primary, and link is up, force it as primary se + if [[ $MODE == "primary" ]]; then + hcnlog INFO "Change bonding primary slave to $DEVNAME" +- echo "$DEVNAME" >"$BOND_PATH"/primary ++ nmcli con mod id "$BONDNAME" +bond.options "primary=$DEVNAME" ++ nmcli con up "$BONDNAME" + fi + + hcnlog DEBUG "do_config_vdevice: exit" diff --git a/powerpc-utils.spec b/powerpc-utils.spec index 301a36a..a51acc1 100644 --- a/powerpc-utils.spec +++ b/powerpc-utils.spec @@ -1,6 +1,6 @@ Name: powerpc-utils Version: 1.3.10 -Release: 4%{?dist} +Release: 5%{?dist} Summary: PERL-based scripts for maintaining and servicing PowerPC systems License: GPLv2 @@ -17,6 +17,7 @@ Patch5: powerpc-utils-c01580-add_NVMf-FC_boot_support_part1.patch Patch6: powerpc-utils-2fbd7c-add_NVMf-FC_boot_support_part2.patch Patch7: powerpc-utils-git3847a1-support_multiple_dev_paths_for_a_nvmf_boot_device.patch Patch8: powerpc-utils-git04e5c9-handle_nsid_as_hex.patch +Patch9: powerpc-utils-fix_setting_primary_slave_across_reboots.patch ExclusiveArch: ppc %{power64} @@ -206,6 +207,9 @@ systemctl enable hcn-init.service >/dev/null 2>&1 || : %changelog +* Mon Dec 12 2022 Than Ngo - 1.3.10-5 +- Resolves: #2125152, HNV bond fails to come up with sriov interface as active slave + * Thu Dec 08 2022 Than Ngo - 1.3.10-4 - Resolves: #2150698, handle nsid of nvmf device as hexadecimal number - Resolves: #2150697, setup multiple device path for a nvmf boot device