From c2fc6e69b5eabcd706879f1b0df30ff19669c584 Mon Sep 17 00:00:00 2001
From: Wei Zhou <w.zhou@leaseweb.com>
Date: Thu, 7 Nov 2013 11:06:42 +0100
Subject: [PATCH] check Linux bridge status before remove it (Cherry-picked
 from commit a33f0e7bdd3bc359e483eca36cf9faf1f2c7c521)

---
 .../com/cloud/hypervisor/kvm/resource/BridgeVifDriver.java  | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/BridgeVifDriver.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/BridgeVifDriver.java
index 84743ec124e..b400fd25032 100644
--- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/BridgeVifDriver.java
+++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/BridgeVifDriver.java
@@ -205,7 +205,11 @@ public class BridgeVifDriver extends VifDriverBase {
 
     private void deleteVnetBr(String brName) {
         synchronized (_vnetBridgeMonitor) {
-            String cmdout = Script.runSimpleBashScript("ls /sys/class/net/" + brName + "/brif | tr '\n' ' '");
+            String cmdout = Script.runSimpleBashScript("ls /sys/class/net/" + brName);
+            if (cmdout == null)
+                // Bridge does not exist
+                return;
+            cmdout = Script.runSimpleBashScript("ls /sys/class/net/" + brName + "/brif | tr '\n' ' '");
             if (cmdout != null && cmdout.contains("vnet")) {
                 // Active VM remains on that bridge
                 return;