ia64/xen-unstable

changeset 16685:9d22f78d9e5a

Merge with ia64 tree
author Keir Fraser <keir.fraser@citrix.com>
date Tue Jan 08 09:45:58 2008 +0000 (2008-01-08)
parents 7515dc56c124 7b7700a30e52
children 40f9dda7c5f5
files
line diff
     1.1 --- a/tools/examples/network-bridge	Sun Dec 30 13:02:16 2007 -0700
     1.2 +++ b/tools/examples/network-bridge	Tue Jan 08 09:45:58 2008 +0000
     1.3 @@ -121,7 +121,8 @@ transfer_addrs () {
     1.4      ip addr show dev ${src} | egrep '^ *inet ' | sed -e "
     1.5  s/inet/ip addr add/
     1.6  s@\([0-9]\+\.[0-9]\+\.[0-9]\+\.[0-9]\+/[0-9]\+\)@\1@
     1.7 -s/${src}/dev ${dst}/
     1.8 +s/${src}/dev ${dst} label ${dst}/
     1.9 +s/secondary//
    1.10  " | sh -e
    1.11      # Remove automatic routes on destination device
    1.12      ip route list | sed -ne "
     2.1 --- a/tools/ioemu/target-i386-dm/qemu-ifup	Sun Dec 30 13:02:16 2007 -0700
     2.2 +++ b/tools/ioemu/target-i386-dm/qemu-ifup	Tue Jan 08 09:45:58 2008 +0000
     2.3 @@ -34,4 +34,4 @@ then
     2.4  fi
     2.5  
     2.6  ifconfig $1 0.0.0.0 up
     2.7 -brctl addif $bridge $1
     2.8 +brctl addif $bridge $1 || true