From d0995cd28140184d861c136ad86af850a9482912 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Thu, 1 Dec 2022 06:12:42 +0000 Subject: [PATCH] Auto sync2gitlab import of powerpc-utils-1.3.10-3.el8.src.rpm --- ...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 d5ef004..4f74141 100644 --- a/powerpc-utils.spec +++ b/powerpc-utils.spec @@ -1,6 +1,6 @@ Name: powerpc-utils Version: 1.3.10 -Release: 2%{?dist} +Release: 3%{?dist} Summary: PERL-based scripts for maintaining and servicing PowerPC systems Group: System Environment/Base @@ -12,6 +12,7 @@ Patch1: powerpc-utils-1.3.10-distro.patch # bz#2121470, Fix lsslot -c mem output when using 4GB LMB size Patch3: powerpc-utils-b1b9e7-LMB_size_4GB.patch Patch4: powerpc-utils-e1f1de-lmb_address_in_hexadecimal.patch +Patch5: powerpc-utils-fix_setting_primary_slave_across_reboots.patch ExclusiveArch: ppc %{power64} @@ -190,6 +191,9 @@ systemctl enable hcn-init.service >/dev/null 2>&1 || : %{_mandir}/man8/lparnumascore.8* %changelog +* Mon Nov 28 2022 Than Ngo - 1.3.10-3 +- Resolves: #2148878, HNV bond fails to come up with sriov interface as active slave + * Fri Oct 21 2022 Than Ngo - 1.3.10-2 - Resolves: #2121481, Fix lsslot -c mem output when using 4GB LMB size