From d92f45a906868d4be0f9cbfb7b64668ed8f31b87 Mon Sep 17 00:00:00 2001 From: bybai Date: Fri, 12 Apr 2019 03:04:10 -0400 Subject: [PATCH] polished --- xCAT/postscripts/confignetwork | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/xCAT/postscripts/confignetwork b/xCAT/postscripts/confignetwork index 9f96a4bda..232d9890d 100755 --- a/xCAT/postscripts/confignetwork +++ b/xCAT/postscripts/confignetwork @@ -563,17 +563,15 @@ function configure_nicdevice { #linux bridge type is bridge #openvswitch bridge type is bridge_ovs elif [ x"$nic_dev_type" = "xbridge_ovs" -o x"$nic_dev_type" = "xbridge" ]; then - if [ "$networkmanager_active" != "1" ]; then - if [ "$networkmanager_active" = "0" ]; then - check_brctl $nic_dev_type - if [ $? -ne 0 ]; then - errorcode=1 - else - create_bridge_interface ifname=$nic_dev _brtype=$nic_dev_type _port=$base_nic_dev _pretype=$base_nic_type - fi + if [ "$networkmanager_active" = "0" ]; then + check_brctl $nic_dev_type + if [ $? -ne 0 ]; then + errorcode=1 else create_bridge_interface ifname=$nic_dev _brtype=$nic_dev_type _port=$base_nic_dev _pretype=$base_nic_type fi + elif [ "$networkmanager_active" = "2" ]; then + create_bridge_interface ifname=$nic_dev _brtype=$nic_dev_type _port=$base_nic_dev _pretype=$base_nic_type else create_bridge_interface_nmcli ifname=$nic_dev _brtype=$nic_dev_type _port=$base_nic_dev _pretype=$base_nic_type _ipaddr=$ipaddrs fi