From mboxrd@z Thu Jan  1 00:00:00 1970
From: Avi Kivity <avi@qumranet.com>
Subject: [PATCH] don't require ebtables in the host kernel
Date: Wed, 22 Feb 2006 10:54:51 +0200
Message-ID: <43FC26DB.7060906@qumranet.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Return-path: <xen-devel-bounces@lists.xensource.com>
List-Unsubscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xensource.com>
List-Help: <mailto:xen-devel-request@lists.xensource.com?subject=help>
List-Subscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=subscribe>
Sender: xen-devel-bounces@lists.xensource.com
Errors-To: xen-devel-bounces@lists.xensource.com
To: xen-devel <xen-devel@lists.xensource.com>
List-Id: xen-devel@lists.xenproject.org

The network-bridge script fails when setting a few sysctls
which are only available if ebtables is present in the host
kernel. Fix by ignoring the return value of the sysctl command.

Signed-off-by: Avi Kivity <avi@qumranet.com>

Index: xen/tools/examples/network-bridge
===================================================================
--- xen/tools/examples/network-bridge	(revision 991)
+++ xen/tools/examples/network-bridge	(revision 992)
@@ -158,9 +158,9 @@
 
     # Don't create the bridge if it already exists.
     if ! brctl show | grep -q ${bridge} ; then
-	sysctl -w "net.bridge.bridge-nf-call-arptables=0"
-	sysctl -w "net.bridge.bridge-nf-call-ip6tables=0"
-	sysctl -w "net.bridge.bridge-nf-call-iptables=0"
+	! sysctl -w "net.bridge.bridge-nf-call-arptables=0"
+	! sysctl -w "net.bridge.bridge-nf-call-ip6tables=0"
+	! sysctl -w "net.bridge.bridge-nf-call-iptables=0"
 	brctl addbr ${bridge}
 	brctl stp ${bridge} off
 	brctl setfd ${bridge} 0


-- 
error compiling committee.c: too many arguments to function