[Xen-changelog] merge

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

# HG changeset patch
# User iap10@xxxxxxxxxxxxxxxxxxxx
# Node ID 8523b124c8f8c38b721d45b896611d77b596c473
# Parent  a3fa9406d92681630cdba422c3c94a966627db39
# Parent  ff34606900049e1525cb6ab3768cd4e11a576bdb
merge

diff -r a3fa9406d926 -r 8523b124c8f8 tools/examples/network-bridge
--- a/tools/examples/network-bridge     Mon Aug 15 19:04:28 2005
+++ b/tools/examples/network-bridge     Tue Aug 16 01:01:19 2005
@@ -188,12 +188,13 @@
                fi
        fi
        ip link set ${netdev} name p${netdev}
-       ip link set veth0 name eth0
+       ip link set veth0 name ${netdev}
        ifconfig p${netdev} -arp down
        ifconfig p${netdev} hw ether fe:ff:ff:ff:ff:ff
        ifconfig ${netdev} hw ether ${mac}
        add_to_bridge ${bridge} vif0.0
        add_to_bridge ${bridge} p${netdev}
+       ip link set ${bridge} up
        ip link set vif0.0 up
        ip link set p${netdev} up
        if ! ifup ${netdev} ; then

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