From 54a2662c3c3ea4a701dd44febfe2902362b1d31e Mon Sep 17 00:00:00 2001
From: Kilian Cavalotti <kilian@stanford.edu>
Date: Fri, 31 Jan 2020 15:03:15 -0800
Subject: [PATCH] configib: pass NMCLI_USED from confignetwork instead of
 checking again

---
 xCAT/postscripts/configib      | 8 ++++++--
 xCAT/postscripts/confignetwork | 4 ++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/xCAT/postscripts/configib b/xCAT/postscripts/configib
index 552a35454..41271ccf8 100755
--- a/xCAT/postscripts/configib
+++ b/xCAT/postscripts/configib
@@ -32,11 +32,15 @@ fi
 ########################################################################
 # nmcli_used=0: use network.service
 # nmcli_used=1: use NetworkManager
+# nmcli_used=2: RH8 postscripts stage, NetworkManager is active but nmcli cannot modify NIC configure file
 ########################################################################
 nmcli_used=0
-ps -ef|grep -v grep|grep NetworkManager >/dev/null 2>/dev/null
-if [ $? -eq 0 ]; then
+if [ -n "$NMCLI_USED" ] ; then
+    if [ "$NMCLI_USED" = "1" ]; then
     nmcli_used=1
+    elif [ "$NMCLI_USED" = "2" ]; then
+        nmcli_used=2
+    fi
 fi
 
 #This is the number of ports for each ib adpator.
diff --git a/xCAT/postscripts/confignetwork b/xCAT/postscripts/confignetwork
index 07e98aa7c..b73968385 100755
--- a/xCAT/postscripts/confignetwork
+++ b/xCAT/postscripts/confignetwork
@@ -610,8 +610,8 @@ function configure_nicdevice {
             fi
         elif [ x"$nic_dev_type" = "xinfiniband" ] || [ x"$nic_dev_type" = "xOmnipath" ]; then
             log_info "Call configib for IB nics: $nic_dev, ports: $num_iba_ports"
-            log_info "NIC_IBNICS=$nic_dev NIC_IBAPORTS=$num_iba_ports configib"
-            NIC_IBNICS=$nic_dev NIC_IBAPORTS=$num_iba_ports configib
+            log_info "NMCLI_USED=$networkmanager_active NIC_IBNICS=$nic_dev NIC_IBAPORTS=$num_iba_ports configib"
+            NMCLI_USED=$networkmanager_active NIC_IBNICS=$nic_dev NIC_IBAPORTS=$num_iba_ports configib
             if [ $? -ne 0 ]; then
                 log_error "configib failed."
                 errorcode=1