commit 94da1d8dee685dbfb062f457597265289d369295
author Alvin Wang <alvinwang@msn.com> Wed Aug 28 15:18:15 2019 +0800
committer Brad Bishop <radsquirrel@gmail.com> Thu Sep 12 13:03:09 2019 +0000
tree f89da31c3cbfe558d98bb7c431d66d03178ebd2c
parent f0cce10b5730eabd3cb3c829c3da0906476e5194

Add two MAC addresses support for Mihawk's 2 NICs

Change-Id: I3d00dab1a5dae40aef18af23ba2346c644070e91
Signed-off-by: Alvin Wang <alvinwang@msn.com>

recipes-phosphor/network/first-boot-set-mac/first-boot-set-mac.sh

diff --git a/recipes-phosphor/network/first-boot-set-mac/first-boot-set-mac.sh b/recipes-phosphor/network/first-boot-set-mac/first-boot-set-mac.sh
index 9668ed5..cf03b82 100755
--- a/recipes-phosphor/network/first-boot-set-mac/first-boot-set-mac.sh
+++ b/recipes-phosphor/network/first-boot-set-mac/first-boot-set-mac.sh
@@ -15,13 +15,34 @@
     INVENTORY_PATH='/xyz/openbmc_project/inventory'
     NETWORK_ITEM_IFACE='xyz.openbmc_project.Inventory.Item.NetworkInterface'
 
-    NETWORK_ITEM_PATH=$(busctl --no-pager --verbose call \
+    # Get the NETWORK ITEM count
+    NETWORK_ITEM_PATH_COUNT=$(busctl --no-pager --verbose call \
+                            ${MAPPER_IFACE} \
+                            ${MAPPER_PATH} \
+                            ${MAPPER_IFACE} \
+                            GetSubTree sias \
+                            ${INVENTORY_PATH} 0 1 ${NETWORK_ITEM_IFACE} \
+                        2>/dev/null | grep ${INVENTORY_PATH} | wc -l || true)
+
+    if [ $NETWORK_ITEM_PATH_COUNT -gt 1 ]; then
+        # If there are more than 2 NETOWRK ITEM and path must contain $1
+        # for finding the right NETWORK ITEM
+        NETWORK_ITEM_PATH=$(busctl --no-pager --verbose call \
+                            ${MAPPER_IFACE} \
+                            ${MAPPER_PATH} \
+                            ${MAPPER_IFACE} \
+                            GetSubTree sias \
+                            ${INVENTORY_PATH} 0 1 ${NETWORK_ITEM_IFACE} \
+                        2>/dev/null | grep ${INVENTORY_PATH} | grep $1 || true)
+    else
+        NETWORK_ITEM_PATH=$(busctl --no-pager --verbose call \
                             ${MAPPER_IFACE} \
                             ${MAPPER_PATH} \
                             ${MAPPER_IFACE} \
                             GetSubTree sias \
                             ${INVENTORY_PATH} 0 1 ${NETWORK_ITEM_IFACE} \
                         2>/dev/null | grep ${INVENTORY_PATH} || true)
+    fi
 
     # '     STRING "/xyz/openbmc_project/inventory/system/chassis/ethernet";'
     NETWORK_ITEM_PATH=${NETWORK_ITEM_PATH#*\"}