[Xen-changelog] [xen-unstable] Merge with ia64 tree

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

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1199785558 0
# Node ID 9d22f78d9e5a0301dc2915cd90018e43c6e6959a
# Parent  7515dc56c124c01229c98ab4157eb165bfd181f3
# Parent  7b7700a30e5280d57ecb9a284ee943aa80ae37f0
Merge with ia64 tree
---
 tools/examples/network-bridge        |    3 ++-
 tools/ioemu/target-i386-dm/qemu-ifup |    2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff -r 7515dc56c124 -r 9d22f78d9e5a tools/examples/network-bridge
--- a/tools/examples/network-bridge     Sun Dec 30 13:02:16 2007 -0700
+++ b/tools/examples/network-bridge     Tue Jan 08 09:45:58 2008 +0000
@@ -121,7 +121,8 @@ transfer_addrs () {
     ip addr show dev ${src} | egrep '^ *inet ' | sed -e "
 s/inet/ip addr add/
 s@\([0-9]\+\.[0-9]\+\.[0-9]\+\.[0-9]\+/[0-9]\+\)@\1@
-s/${src}/dev ${dst}/
+s/${src}/dev ${dst} label ${dst}/
+s/secondary//
 " | sh -e
     # Remove automatic routes on destination device
     ip route list | sed -ne "
diff -r 7515dc56c124 -r 9d22f78d9e5a tools/ioemu/target-i386-dm/qemu-ifup
--- a/tools/ioemu/target-i386-dm/qemu-ifup      Sun Dec 30 13:02:16 2007 -0700
+++ b/tools/ioemu/target-i386-dm/qemu-ifup      Tue Jan 08 09:45:58 2008 +0000
@@ -34,4 +34,4 @@ fi
 fi
 
 ifconfig $1 0.0.0.0 up
-brctl addif $bridge $1
+brctl addif $bridge $1 || true

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