From 11e45fd741a762901fe30bbe0c9a2c47f4505ad8 Mon Sep 17 00:00:00 2001
From: bybai <bybai@cn.ibm.com>
Date: Wed, 10 Apr 2019 04:36:46 -0400
Subject: [PATCH] unify nicextraparams interface for RH8 and RH7

---
 xCAT/postscripts/configeth     | 40 ++++++++++++++++++----------------
 xCAT/postscripts/confignetwork |  3 ++-
 xCAT/postscripts/nicutils.sh   | 17 +++++++++------
 3 files changed, 33 insertions(+), 27 deletions(-)

diff --git a/xCAT/postscripts/configeth b/xCAT/postscripts/configeth
index c19775684..6b116c27b 100755
--- a/xCAT/postscripts/configeth
+++ b/xCAT/postscripts/configeth
@@ -183,27 +183,27 @@ function configipv4(){
                 echo "MTU=${str_nic_mtu}" >> $str_conf_file
             fi
         fi
-
+        if [ $networkmanager_active -eq 1 ]; then
+            str_conf_file_1="/etc/sysconfig/network-scripts/ifcfg-xcat-${str_if_name}-1"
+            if [ -f $str_conf_file_1 ]; then
+                grep -x "NAME=$con_name" $str_conf_file_1 >/dev/null 2>/dev/null
+                if [ $? -eq 0 ]; then
+                    str_conf_file=$str_conf_file_1
+                fi
+            fi
+        fi
         if [[ ${str_if_name} == [a-zA-Z0-9]*.[0-9]* ]]; then
             echo "VLAN=yes" >> $str_conf_file
         fi
-
         #add extra params
         i=0
         while [ $i -lt ${#array_extra_param_names[@]} ]
         do
             name="${array_extra_param_names[$i]}"
             value="${array_extra_param_values[$i]}"
-            echo "$i: name=$name value=$value"
-            if [ $networkmanager_active -eq 1 ]; then
-                str_conf_file_1="/etc/sysconfig/network-scripts/ifcfg-xcat-${str_if_name}-1"
-                if [ -e $str_conf_file_1 ]; then
-                    echo "${name}=${value}" >> $str_conf_file_1
-                fi
-            fi
-            echo "${name}=${value}" >> $str_conf_file
+            echo "${name}=${value}" >> $str_conf_file 
     	    i=$((i+1))
-        done		
+        done
     fi
 }
 
@@ -699,7 +699,15 @@ elif [ "$1" = "-s" ];then
                 echo "GATEWAY=${str_inst_gateway}" >> /etc/sysconfig/network
             fi
         fi
-
+        if [ $networkmanager_active -eq 1 ]; then
+            str_conf_file_1="/etc/sysconfig/network-scripts/ifcfg-xcat-${str_if_name}-1"
+            if [ -f $str_conf_file_1 ]; then
+                grep $con_name $str_conf_file_1 >/dev/null 2>/dev/null
+                if [ $? -eq 0 ]; then
+                    $str_conf_file=$str_conf_file_1
+                fi
+            fi
+        fi
 	    #add extra params
         i=0
         while [ $i -lt ${#array_extra_param_names[@]} ]
@@ -707,12 +715,6 @@ elif [ "$1" = "-s" ];then
             name="${array_extra_param_names[$i]}"
             value="${array_extra_param_values[$i]}"
             echo "$i: name=$name value=$value"
-            if [ $networkmanager_active -eq 1 ]; then
-                str_conf_file_1="/etc/sysconfig/network-scripts/ifcfg-xcat-install-${str_if_name}-1"
-                if [ -e $str_conf_file_1 ]; then
-                    echo "${name}=${value}" >> $str_conf_file_1
-                fi
-            fi
             echo "${name}=${value}" >> $str_conf_file
             i=$((i+1))
         done		
@@ -740,7 +742,7 @@ elif [ "$1" = "-s" ];then
         if [ $networkmanager_active -eq 1 ]; then
             nmcli con reload
             nmcli con up $con_name
-	else
+	    else
             ifup $str_inst_nic
         fi
         if [ $? -ne 0 ]; then
diff --git a/xCAT/postscripts/confignetwork b/xCAT/postscripts/confignetwork
index 40f4d4ace..89f06d305 100755
--- a/xCAT/postscripts/confignetwork
+++ b/xCAT/postscripts/confignetwork
@@ -63,7 +63,8 @@ function get_nic_cfg_file_content {
     elif [ $is_debian -eq 1 ]; then
          cfg_file="$nwdir/${cfg_dev}"
     fi
-    if [ "$networkmanager_active" = "1" ]; then
+    ps -ef|grep -v grep|grep NetworkManager >/dev/null 2>/dev/null
+    if [ $? -eq 0 ]; then
         $ip address show dev ${cfg_dev}| $sed -e 's/^/[Ethernet] >> /g' | log_lines info
     else
         if [ -f $cfg_file ]; then
diff --git a/xCAT/postscripts/nicutils.sh b/xCAT/postscripts/nicutils.sh
index b67ca637d..86acd954f 100755
--- a/xCAT/postscripts/nicutils.sh
+++ b/xCAT/postscripts/nicutils.sh
@@ -1793,6 +1793,14 @@ function add_extra_params_nmcli {
     nicdev=$1
     con_name=$2
     rc=0
+    str_conf_file="/etc/sysconfig/network-scripts/ifcfg-${con_name}"
+    str_conf_file_1="/etc/sysconfig/network-scripts/ifcfg-${con_name}-1"
+    if [ -f $str_conf_file_1 ]; then
+        grep -x "NAME=$con_name" $str_conf_file_1 >/dev/null 2>/dev/null
+        if [ $? -eq 0 ]; then
+            str_conf_file=$str_conf_file_1
+        fi
+    fi
     #query extra params
     query_extra_params $nicdev
     i=0
@@ -1801,19 +1809,14 @@ function add_extra_params_nmcli {
         name="${array_extra_param_names[$i]}"
         value="${array_extra_param_values[$i]}"
         if [ -n "$name" -a -n "$value" ]; then
-            cmd="$nmcli con modify $con_name $name $value"
-            log_info $cmd
-            $cmd
-            if [ $? -ne 0 ]; then
-                log_error "add extra params $name $value for $con_name failed"
-                rc=1
-            fi
+            echo "$name=$value" >> $str_conf_file
         else
             log_error "invalid extra params $name $value, please check nics.nicextraparams"
             rc=1
         fi
         i=$((i+1))
     done
+    $nmcli con reload $str_conf_file
     return $rc
 }