diff --git a/xCAT/postscripts/confignetwork b/xCAT/postscripts/confignetwork index 2b946b2f3..14b829bc3 100755 --- a/xCAT/postscripts/confignetwork +++ b/xCAT/postscripts/confignetwork @@ -554,19 +554,19 @@ 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 - check_brctl $nic_dev_type + 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" = "1" ]; then + create_bridge_interface_nmcli ifname=$nic_dev _brtype=$nic_dev_type _port=$base_nic_dev _pretype=$base_nic_type _ipaddr=$ipaddrs + fi if [ $? -ne 0 ]; then - errorcode=1 - else - if [ "$networkmanager_active" = "0" ]; then - create_bridge_interface ifname=$nic_dev _brtype=$nic_dev_type _port=$base_nic_dev _pretype=$base_nic_type - elif [ "$networkmanager_active" = "1" ]; then - create_bridge_interface_nmcli ifname=$nic_dev _brtype=$nic_dev_type _port=$base_nic_dev _pretype=$base_nic_type _ipaddr=$ipaddrs - if [ $? -ne 0 ]; then - log_error "create bridge interface $nic_dev failed" - errorcode=1; - fi - fi + log_error "create bridge interface $nic_dev failed" + errorcode=1; fi #configure vlan elif [ x"$nic_dev_type" = "xvlan" ]; then