[Xen-changelog] [xen-unstable] [setup] Fix old style bridge setup.

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Christian Limpach <Christian.Limpach@xxxxxxxxxxxxx>
# Date 1176314650 -3600
# Node ID 27eaa7fe92d26c97a98d0564c47ecde3c428b9e0
# Parent  46a592e2b7eae1d45e77bab9672d9201f0d476ee
[setup] Fix old style bridge setup.
Also only warn that we ran out of veth interfaces if we have any at all.

Signed-off-by: Christian Limpach <Christian.Limpach@xxxxxxxxxxxxx>
---
 tools/examples/network-bridge |   19 +++++++++++--------
 1 files changed, 11 insertions(+), 8 deletions(-)

diff -r 46a592e2b7ea -r 27eaa7fe92d2 tools/examples/network-bridge
--- a/tools/examples/network-bridge     Wed Apr 11 22:24:30 2007 +0100
+++ b/tools/examples/network-bridge     Wed Apr 11 19:04:10 2007 +0100
@@ -183,12 +183,12 @@ op_start () {
        return
     fi
 
-    if ! link_exists "$vdev"; then
-        if link_exists "$pdev"; then
-            # The device is already up.
-            return
-        else
-            echo "
+    if link_exists "$pdev"; then
+       # The device is already up.
+       return
+    fi
+    if link_exists veth0 && ! link_exists "$vdev"; then
+       echo "
 Link $vdev is missing.
 This may be because you have reached the limit of the number of interfaces
 that the loopback driver supports.  If the loopback driver is a module, you
@@ -196,8 +196,7 @@ driver is compiled statically into the k
 driver is compiled statically into the kernel, then you may set the parameter
 using netloop.nloopbacks=<N> on the domain 0 kernel command line.
 " >&2
-            exit 1
-        fi
+       exit 1
     fi
 
     create_bridge ${bridge}
@@ -224,9 +223,13 @@ using netloop.nloopbacks=<N> on the doma
        add_to_bridge2 ${bridge} ${pdev}
        do_ifup ${netdev}
     else
+       ip link set ${bridge} arp on
+       ip link set ${bridge} multicast on
        # old style without ${vdev}
        transfer_addrs  ${netdev} ${bridge}
        transfer_routes ${netdev} ${bridge}
+       # Attach the real interface to the bridge.
+       add_to_bridge ${bridge} ${netdev}
     fi
 
     if [ ${antispoof} = 'yes' ] ; then

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog