xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-05-29 17:23:08 +00:00
Code Issues Releases Wiki Activity

Merge pull request #6128 from bybai/bri_check

Browse Source 
replace check brctl position since there is no bridge-utils RH8
This commit is contained in:
zet809 2019-03-19 17:53:13 +08:00 committed by GitHub
commit 958ea56e70
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
xCAT/postscripts/confignetwork
View File

@ -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