diff options
| author | Keir Fraser <keir.fraser@citrix.com> | 2008-01-08 09:45:58 +0000 |
|---|---|---|
| committer | Keir Fraser <keir.fraser@citrix.com> | 2008-01-08 09:45:58 +0000 |
| commit | 7be3611da8c837b6e397a133d4ff28d417249334 (patch) | |
| tree | 757ef6c1b605996012630aa21c37444bf7b4899e | |
| parent | 35bcc2fe20cc3ce1091dd82a181a21c61298d19c (diff) | |
| parent | 83501deecf218877bc0aa745180686ddc9c2159c (diff) | |
| download | xen-7be3611da8c837b6e397a133d4ff28d417249334.tar.gz xen-7be3611da8c837b6e397a133d4ff28d417249334.tar.bz2 xen-7be3611da8c837b6e397a133d4ff28d417249334.zip | |
Merge with ia64 tree
| -rwxr-xr-x | tools/examples/network-bridge | 3 | ||||
| -rw-r--r-- | tools/ioemu/target-i386-dm/qemu-ifup | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/tools/examples/network-bridge b/tools/examples/network-bridge index d558b9f552..9244f0a75c 100755 --- a/tools/examples/network-bridge +++ b/tools/examples/network-bridge @@ -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 --git a/tools/ioemu/target-i386-dm/qemu-ifup b/tools/ioemu/target-i386-dm/qemu-ifup index bdc5aecc0e..bcbee92d65 100644 --- a/tools/ioemu/target-i386-dm/qemu-ifup +++ b/tools/ioemu/target-i386-dm/qemu-ifup @@ -34,4 +34,4 @@ then fi ifconfig $1 0.0.0.0 up -brctl addif $bridge $1 +brctl addif $bridge $1 || true |