From 04f19ec2039f6eee9eda0a8f68b88648f55d05c1 Mon Sep 17 00:00:00 2001
From: bybai <bybai@cn.ibm.com>
Date: Mon, 25 Jan 2016 03:16:01 -0500
Subject: [PATCH] issue 628 The postscript confignetwork failed and exited with
 zero exit code when command brctl

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

diff --git a/xCAT/postscripts/nicutils.sh b/xCAT/postscripts/nicutils.sh
index 2abdb7b7c..4e065a816 100755
--- a/xCAT/postscripts/nicutils.sh
+++ b/xCAT/postscripts/nicutils.sh
@@ -608,6 +608,8 @@ function migrate_ip {
 
 }
 
+
+
 ###############################################################################
 #
 # create bridge
@@ -621,9 +623,11 @@ function add_br() {
      BRIDGE=$2
 
      if [[ $BRIDGE == "bridge_ovs" ]]; then
-         log_info "ovs-vsctl add-br $BNAME" 
+         type brctl >/dev/null 2>/dev/null || echo "There is no ovs-vsctl" >&2 && exit 1
+         log_info "ovs-vsctl add-br $BNAME"
          ovs-vsctl add-br $BNAME
      elif [[ $BRIDGE == "bridge" ]]; then
+         type brctl >/dev/null 2>/dev/null || echo "There is no brctl" >&2 && exit 1
          log_info "brctl addbr $BNAME" 
          brctl addbr $BNAME
      fi
@@ -643,6 +647,9 @@ function add_if() {
     BRIDGE=$3
 
     if [[ $BRIDGE == "bridge_ovs" ]]; then
+g_info "ovs-vsctl add-br $BNAME"
+         ovs-vsctl add-br $BNAME
+
         log_info "ovs-vsctl add-port $BNAME $PORT" 
         ovs-vsctl add-port $BNAME $PORT
     elif [[ $BRIDGE == "bridge" ]]; then