From: Xiaohua Zhang <xiaohua.zhang@windriver.com>
Date: Tue, 19 May 2020 13:33:16 +0000 (+0000)
Subject: Merge "fm-mgr: fix to avoid useradd error"
X-Git-Tag: bronze-rc2^0
X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=9d6826903db0a8f3d04af88f0b2e6b35fcc7bcd9;hp=7ba5a6ce373782752bb0da8aa0d3e038dc057396;p=pti%2Frtp.git

Merge "fm-mgr: fix to avoid useradd error"
---

diff --git a/meta-stx/recipes-core/stx-config/files/sriovpf-bring-up.patch b/meta-stx/recipes-core/stx-config/files/sriovpf-bring-up.patch
new file mode 100644
index 0000000..8e9e91e
--- /dev/null
+++ b/meta-stx/recipes-core/stx-config/files/sriovpf-bring-up.patch
@@ -0,0 +1,16 @@
+diff -ruN a/sysinv/sysinv/sysinv/sysinv/puppet/interface.py b/sysinv/sysinv/sysinv/sysinv/puppet/interface.py
+--- a/sysinv/sysinv/sysinv/sysinv/puppet/interface.py	2020-05-19 09:09:32.685727476 +0000
++++ b/sysinv/sysinv/sysinv/sysinv/puppet/interface.py	2020-05-19 09:10:34.225727195 +0000
+@@ -938,8 +938,10 @@
+             # others share the same pci-sriov sysfs enabling mechanism
+             sriovfs_path = ("/sys/class/net/%s/device/sriov_numvfs" %
+                             get_interface_port_name(context, iface))
+-            options['pre_up'] = "echo 0 > %s; echo %s > %s" % (
+-                sriovfs_path, iface['sriov_numvfs'], sriovfs_path)
++            sriovpf_up_cmd = ("ifconfig %s up" %
++                            get_interface_port_name(context, iface))
++            options['pre_up'] = "echo 0 > %s; echo %s > %s; %s" % (
++                sriovfs_path, iface['sriov_numvfs'], sriovfs_path, sriovpf_up_cmd)
+     elif interface_class == constants.INTERFACE_CLASS_PCI_PASSTHROUGH:
+         sriovfs_path = ("/sys/class/net/%s/device/sriov_numvfs" %
+                         get_interface_port_name(context, iface))
diff --git a/meta-stx/recipes-core/stx-config/stx-config.bb b/meta-stx/recipes-core/stx-config/stx-config.bb
index 89e7ff0..0f56b06 100644
--- a/meta-stx/recipes-core/stx-config/stx-config.bb
+++ b/meta-stx/recipes-core/stx-config/stx-config.bb
@@ -29,6 +29,7 @@ SRC_URI = " \
 	git://opendev.org/starlingx/config.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH} \
 	file://0001-stx-config-remove-argparse-requirement-from-sysinv.patch \
 	file://0002-cgts-client-handle-exceptions-other-than-CalledProcessErr.patch \
+	file://sriovpf-bring-up.patch \
 	"
 
 DEPENDS = "\