From 2ef2cc9cf90d024bff9da41f8a116b117e6b2751 Mon Sep 17 00:00:00 2001
From: Chiradeep Vittal <chiradeep@cloud.com>
Date: Thu, 3 Feb 2011 11:45:39 -0800
Subject: [PATCH] bug 8347: skip ebtables if kernel doesn't support it status
 8347: resolved fixed

---
 scripts/vm/hypervisor/xenserver/vmops | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/scripts/vm/hypervisor/xenserver/vmops b/scripts/vm/hypervisor/xenserver/vmops
index df06e894147..d7d344ac4a7 100755
--- a/scripts/vm/hypervisor/xenserver/vmops
+++ b/scripts/vm/hypervisor/xenserver/vmops
@@ -1579,7 +1579,11 @@ def default_ebtables_rules(vm_name, vif, vm_ip, vm_mac):
         try:
             util.pread2(['ebtables', '-t', 'nat', '-N', chain])
         except:
-            util.pread2(['ebtables', '-t',  'nat',  '-F', chain]) 
+            try:
+                util.pread2(['ebtables', '-t',  'nat',  '-F', chain]) 
+            except:
+                util.SMlog("Failed to create ebtables nat rule, skipping")
+                return 'true'
 
     try:
         # -s ! 52:54:0:56:44:32 -j DROP 
@@ -1610,6 +1614,8 @@ def default_ebtables_rules(vm_name, vif, vm_ip, vm_mac):
     except:
         util.SMlog("Failed to program default ebtables OUT rules")
         return 'false' 
+
+    return 'true'
     
             
 @echo