[Xen-changelog] [xen-3.1-testing] Handle netdev secondary addresses and labels

["Xen patchbot-3.1-testing" <patchbot-3.1-testing@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1199964934 0
# Node ID 0e68233d9176c3a2b45822628f453682e1349747
# Parent  8dbb6b32afaf2ab82df875663223881657d4c4b7
Handle netdev secondary addresses and labels

Fix the network-bridge logic to correctly transfer secondary IP
address from $netdev to $bridge.

e.g. if you add an secondary address/label/alias with:

  $> ip addr add 172.31.0.200/24 dev eth0 label eth0:00

then, "ip addr show dev eth0" gives e.g.:

  inet 172.31.0.10/24 brd 172.31.0.255 scope global eth0
  inet 172.31.0.200/24 scope global secondary eth0:00

and transfer_addrs() tries to execute:

  ip addr add 172.31.0.10/24 brd 172.31.0.255 scope global dev
  tmpbridge
  ip addr add 172.31.0.200/24 scope global secondary dev tmpbridge:00

which causes the sript to fail because:

  1) The device tmpbridge:00 doesn't exist
  2) The "secondary" flag isn't valid

This patch fixes the sed commands to instead give:

  ip addr add 172.31.0.10/24 brd 172.31.0.255 scope global dev
  tmpbridge label tmpbridge
  ip addr add 172.31.0.200/24 scope global dev tmpbridge label
  tmpbridge:00

Signed-off-by: Mark McLoughlin <markmc@xxxxxxxxxx>
xen-unstable changeset:   16680:7b7700a30e5280d57ecb9a284ee943aa80ae37f0
xen-unstable date:        Tue Jan 08 09:43:44 2008 +0000
---
 tools/examples/network-bridge |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)

diff -r 8dbb6b32afaf -r 0e68233d9176 tools/examples/network-bridge
--- a/tools/examples/network-bridge     Thu Jan 10 11:34:38 2008 +0000
+++ b/tools/examples/network-bridge     Thu Jan 10 11:35:34 2008 +0000
@@ -101,7 +101,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 "

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