[Xen-changelog] Fix network bridge script to select the right interface when bridge already exists.

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

# HG changeset patch
# User cl349@xxxxxxxxxxxxxxxxxxxx
# Node ID 062d109ce87292cef784db169add4c649879200d
# Parent  d0c7cc0afd15f2293d25cc538ac6bfcc307f3c4b
Fix network bridge script to select the right interface when bridge already 
exists.
If the bridge is already configure, the default route will point
to a xenbr interface and not an eth interface.  Handle this case.

Signed-off-by: Christian Limpach <Christian.Limpach@xxxxxxxxxxxx>
---
 tools/examples/network-bridge |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

diff -r d0c7cc0afd15 -r 062d109ce872 tools/examples/network-bridge
--- a/tools/examples/network-bridge     Thu May 11 17:30:50 2006 +0100
+++ b/tools/examples/network-bridge     Thu May 11 22:39:44 2006 +0100
@@ -59,7 +59,7 @@ findCommand "$@"
 findCommand "$@"
 evalVariables "$@"
 
-vifnum=${vifnum:-$(ip route list | awk '/^default / { sub(/eth/,"",$NF); print 
$NF }')}
+vifnum=${vifnum:-$(ip route list | awk '/^default / { 
sub(/^(eth|xenbr)/,"",$NF); print $NF }')}
 bridge=${bridge:-xenbr${vifnum}}
 netdev=${netdev:-eth${vifnum}}
 antispoof=${antispoof:-no}

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