2
0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-05-30 17:46:38 +00:00

defect 639 Spanning Tree Protocol is not enabled by default

This commit is contained in:
bybai 2016-01-29 01:34:43 -05:00
parent b00d9e8555
commit 18fae8ab69

View File

@ -631,6 +631,8 @@ function add_br() {
type brctl >/dev/null 2>/dev/null || echo "There is no brctl" >&2 && exit 1
log_info "brctl addbr $BNAME"
brctl addbr $BNAME
log_info "brctl stp $BNAME on"
brctl stp $BNAME on
fi
}
@ -657,6 +659,8 @@ function add_if() {
log_info "brctl addif $BNAME $PORT"
brctl addif $BNAME $PORT
fi
}
###############################################################################
@ -845,7 +849,7 @@ function create_bridge_interface {
# generate bridge interface definition
cfg=""
cfg="${cfg}${cfg:+,}ONBOOT=yes"
cfg="${cfg}${cfg:+,}STP=on"
if grep -q -i "release 6" /etc/redhat-release ; then
cfg="${cfg}${cfg:+,}NM_CONTROLLED=no"
fi