From 5d2e83740212ef7489bc3c626ab2698dbe9f016b Mon Sep 17 00:00:00 2001
From: bybai <bybai@cn.ibm.com>
Date: Thu, 28 Jan 2016 01:46:15 -0500
Subject: [PATCH 1/3] issue 632 failed to create tagged VLAN interface with
 leading zeros in the VLAN id

---
 xCAT/postscripts/nicutils.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/xCAT/postscripts/nicutils.sh b/xCAT/postscripts/nicutils.sh
index 0c74865bf..2b57d807b 100755
--- a/xCAT/postscripts/nicutils.sh
+++ b/xCAT/postscripts/nicutils.sh
@@ -1020,8 +1020,8 @@ function create_vlan_interface {
     do
         if [ $i -eq 0 ]; then
             # alternative cmd to "vconfig add $ifname $vlanid"
-            $ip link add link $ifname name $ifname.$vlanid type vlan id $vlanid
-            log_info "$ip link add link $ifname name $ifname.$vlanid type vlan id $vlanid"
+            $ip link add link $ifname name $ifname.$vlanid type vlan id $(( 10#$vlanid ))
+            log_info "$ip link add link $ifname name $ifname.$vlanid type vlan id $(( 10#$vlanid ))"
         fi
         $sleep 0.5
         ((i+=1))

From b00d9e85550413d1390cfdf591060e9f2c47f3fb Mon Sep 17 00:00:00 2001
From: bybai <bybai@cn.ibm.com>
Date: Thu, 28 Jan 2016 03:56:26 -0500
Subject: [PATCH 2/3] issue 629 failed to configure link aggregation out of the
 box

---
 xCAT/postscripts/nicutils.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/xCAT/postscripts/nicutils.sh b/xCAT/postscripts/nicutils.sh
index 2b57d807b..3141020ff 100755
--- a/xCAT/postscripts/nicutils.sh
+++ b/xCAT/postscripts/nicutils.sh
@@ -26,6 +26,7 @@ ifconfig="ifconfig"
 brctl="brctl"
 uniq="uniq"
 xargs="xargs"
+modprobe="modprobe"
 
 ######################################################
 #

From 18fae8ab692d35bafcdaa45e13987a83eaa8a4bd Mon Sep 17 00:00:00 2001
From: bybai <bybai@cn.ibm.com>
Date: Fri, 29 Jan 2016 01:34:43 -0500
Subject: [PATCH 3/3] defect 639 Spanning Tree Protocol is not enabled by
 default

---
 xCAT/postscripts/nicutils.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/xCAT/postscripts/nicutils.sh b/xCAT/postscripts/nicutils.sh
index 3141020ff..2d9bbb10e 100755
--- a/xCAT/postscripts/nicutils.sh
+++ b/xCAT/postscripts/nicutils.sh
@@ -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