diff -uNrp xen-unstable/tools/examples/network-bridge xen-unstable.xenbr0/tools/examples/network-bridge --- xen-unstable/tools/examples/network-bridge 2005-09-04 17:32:44.000000000 +0200 +++ xen-unstable.xenbr0/tools/examples/network-bridge 2005-09-04 23:00:04.890357775 +0200 @@ -5,7 +5,7 @@ # The script name to use is defined in /etc/xen/xend-config.sxp # in the network-script field. # -# This script creates a bridge (default xen-br0), adds a device +# This script creates a bridge (default xenbr0), adds a device # (default eth0) to it, copies the IP addresses from the device # to the bridge and adjusts the routes accordingly. # @@ -20,7 +20,7 @@ # # Vars: # -# bridge The bridge to use (default xen-br0). +# bridge The bridge to use (default xenbr0). # netdev The interface to add to the bridge (default eth0). # antispoof Whether to use iptables to prevent spoofing (default yes). # @@ -49,7 +49,7 @@ shift # Pull variables in args in to environment. for arg ; do export "${arg}" ; done -bridge=${bridge:-xen-br0} +bridge=${bridge:-xenbr0} netdev=${netdev:-eth0} antispoof=${antispoof:-no} diff -uNrp xen-unstable/tools/examples/vif-bridge xen-unstable.xenbr0/tools/examples/vif-bridge --- xen-unstable/tools/examples/vif-bridge 2005-09-04 17:32:44.000000000 +0200 +++ xen-unstable.xenbr0/tools/examples/vif-bridge 2005-09-04 22:59:14.914104012 +0200 @@ -8,7 +8,7 @@ # # Example invocation: # -# vif-bridge up domain=VM1 vif=vif1.0 bridge=xen-br0 ip="128.232.38.45/28 10.10.10.55/24" +# vif-bridge up domain=VM1 vif=vif1.0 bridge=xenbr0 ip="128.232.38.45/28 10.10.10.55/24" # # # Usage: diff -uNrp xen-unstable/tools/examples/xend-config.sxp xen-unstable.xenbr0/tools/examples/xend-config.sxp --- xen-unstable/tools/examples/xend-config.sxp 2005-09-04 17:32:44.000000000 +0200 +++ xen-unstable.xenbr0/tools/examples/xend-config.sxp 2005-09-04 22:58:46.384097228 +0200 @@ -30,7 +30,7 @@ # The script used to start/stop networking for xend. (network-script network-bridge) # The default bridge that virtual interfaces should be connected to. -(vif-bridge xen-br0) +(vif-bridge xenbr0) # The default script used to control virtual interfaces. (vif-script vif-bridge) diff -uNrp xen-unstable/tools/examples/xmexample.vmx xen-unstable.xenbr0/tools/examples/xmexample.vmx --- xen-unstable/tools/examples/xmexample.vmx 2005-09-04 17:32:44.000000000 +0200 +++ xen-unstable.xenbr0/tools/examples/xmexample.vmx 2005-09-04 22:58:58.906905511 +0200 @@ -24,7 +24,7 @@ name = "ExampleVMXDomain" # Optionally define mac and/or bridge for the network interfaces. # Random MACs are assigned if not given. -#vif = [ 'mac=aa:00:00:00:00:11, bridge=xen-br0' ] +#vif = [ 'mac=aa:00:00:00:00:11, bridge=xenbr0' ] #---------------------------------------------------------------------------- # Define the disk devices you want the domain to have access to, and diff -uNrp xen-unstable/tools/examples/xmexample1 xen-unstable.xenbr0/tools/examples/xmexample1 --- xen-unstable/tools/examples/xmexample1 2005-09-04 17:32:44.000000000 +0200 +++ xen-unstable.xenbr0/tools/examples/xmexample1 2005-09-04 22:59:34.769629074 +0200 @@ -36,7 +36,7 @@ name = "ExampleDomain" # Optionally define mac and/or bridge for the network interfaces. # Random MACs are assigned if not given. -#vif = [ 'mac=aa:00:00:00:00:11, bridge=xen-br0' ] +#vif = [ 'mac=aa:00:00:00:00:11, bridge=xenbr0' ] #---------------------------------------------------------------------------- # Define the disk devices you want the domain to have access to, and diff -uNrp xen-unstable/tools/examples/xmexample2 xen-unstable.xenbr0/tools/examples/xmexample2 --- xen-unstable/tools/examples/xmexample2 2005-09-04 17:32:44.000000000 +0200 +++ xen-unstable.xenbr0/tools/examples/xmexample2 2005-09-04 22:59:44.313958742 +0200 @@ -67,7 +67,7 @@ vcpus = 4 # make your domain a 4-way # Optionally define mac and/or bridge for the network interfaces. # Random MACs are assigned if not given. -#vif = [ 'mac=aa:00:00:00:00:11, bridge=xen-br0' ] +#vif = [ 'mac=aa:00:00:00:00:11, bridge=xenbr0' ] #---------------------------------------------------------------------------- # Define the disk devices you want the domain to have access to, and diff -uNrp xen-unstable/tools/ioemu/target-i386-dm/qemu-ifup xen-unstable.xenbr0/tools/ioemu/target-i386-dm/qemu-ifup --- xen-unstable/tools/ioemu/target-i386-dm/qemu-ifup 2005-07-19 03:53:26.000000000 +0200 +++ xen-unstable.xenbr0/tools/ioemu/target-i386-dm/qemu-ifup 2005-09-04 23:00:25.296786641 +0200 @@ -7,4 +7,4 @@ echo 'config qemu network with xen bridg echo $* ifconfig $1 0.0.0.0 up -brctl addif xen-br0 $1 +brctl addif xenbr0 $1 diff -uNrp xen-unstable/tools/misc/netfix xen-unstable.xenbr0/tools/misc/netfix --- xen-unstable/tools/misc/netfix 2005-07-19 03:53:26.000000000 +0200 +++ xen-unstable.xenbr0/tools/misc/netfix 2005-09-04 23:00:42.846715465 +0200 @@ -3,7 +3,7 @@ #============================================================================ # Copyright (C) 2004 Mike Wray #============================================================================ -# Move the IP address from eth0 onto the Xen bridge (xen-br0). +# Move the IP address from eth0 onto the Xen bridge (xenbr0). # Only works if the bridge control utils (brctl) have been installed. #============================================================================ @@ -19,7 +19,7 @@ long_options = ['help', 'verbose', 'qui 'interface=', 'bridge=', 'create'] defaults['interface'] = 'eth0' -defaults['bridge'] = 'xen-br0' +defaults['bridge'] = 'xenbr0' def usage(): print """Usage: diff -uNrp xen-unstable/tools/python/xen/xend/XendRoot.py xen-unstable.xenbr0/tools/python/xen/xend/XendRoot.py --- xen-unstable/tools/python/xen/xend/XendRoot.py 2005-09-04 17:32:44.000000000 +0200 +++ xen-unstable.xenbr0/tools/python/xen/xend/XendRoot.py 2005-09-04 23:01:01.528446304 +0200 @@ -321,7 +321,7 @@ class XendRoot: return self.get_config_bool('enable-dump', 'no') def get_vif_bridge(self): - return self.get_config_value('vif-bridge', 'xen-br0') + return self.get_config_value('vif-bridge', 'xenbr0') def get_vif_script(self): return self.get_config_value('vif-script', 'vif-bridge') diff -uNrp xen-unstable/tools/vnet/vnet-module/varp.c xen-unstable.xenbr0/tools/vnet/vnet-module/varp.c --- xen-unstable/tools/vnet/vnet-module/varp.c 2005-09-04 17:32:45.000000000 +0200 +++ xen-unstable.xenbr0/tools/vnet/vnet-module/varp.c 2005-09-04 23:01:21.266992289 +0200 @@ -176,7 +176,7 @@ u32 varp_mcast_addr = 0; /** UDP port (network order). */ u16 varp_port = 0; -char *varp_device = "xen-br0"; +char *varp_device = "xenbr0"; #define VarpTable_read_lock(z, flags) do{ (flags) = 0; down(&(z)->lock); } while(0) #define VarpTable_read_unlock(z, flags) do{ (flags) = 0; up(&(z)->lock); } while(0)