X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=system%2Ftemplate-qemu%2Fqemu-bridge-init;h=d182557a5812dba56a097f4bb3121221d8462ee8;hb=7ab545cde7518604b8bd70275da16dcfe855ac4a;hp=1749d6f38b6ba2c6599d4e34e6c3f6c3b92ffcd2;hpb=4641638de7866e46f8b554b0ede08680e3b84fe7;p=tests.git

diff --git a/system/template-qemu/qemu-bridge-init b/system/template-qemu/qemu-bridge-init
index 1749d6f..d182557 100755
--- a/system/template-qemu/qemu-bridge-init
+++ b/system/template-qemu/qemu-bridge-init
@@ -17,19 +17,32 @@ set -x
 # constant
 INTERFACE_BRIDGE=br0
 
-# Default Value for INTERFACE_LAN
-# let's try to figure out the interface to use - try these in order
-IFNAMES="eth0 eth1 eth2 eth3"
+#################### compute INTERFACE_LAN
+# use /proc/net/dev instead of a hard-wired list
+function gather_interfaces () {
+    python <<EOF
+for line in file("/proc/net/dev"):
+    if ':' not in line: continue
+    ifname=line.replace(" ","").split(":")[0]
+    if ifname.find("lo")==0: continue
+    if ifname.find("br")==0: continue
+    if ifname.find("virbr")==0: continue
+    if ifname.find("tap")==0: continue
+    print ifname
+EOF
+}
+    
 function discover_interface () {
-    for ifname in $IFNAMES; do
-	ip link show $ifname | grep -q UP && { INTERFACE_LAN=$ifname; return; }
+    for ifname in $(gather_interfaces); do
+	ip link show $ifname | grep -qi 'state UP' && { echo $ifname; return; }
     done
     # still not found ? that's bad
-    INTERFACE_LAN=unknown
+    echo unknown
 }
-discover_interface
-echo $INTERFACE_LAN
+INTERFACE_LAN=$(discover_interface)
+echo Using physical interface $INTERFACE_LAN
 
+####################
 # Fonction de mise en place du pont
 function start () {