From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Tue, 16 Apr 2013 13:47:02 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/tests
X-Git-Tag: tests-5.2-2~16
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=d6bf4b85d5614301693ca30642ecd484cba11fb2;hp=cf8c39b37a64fdb09f275330daa9f78b2a7a5cb6;p=tests.git

Merge branch 'master' of ssh://git.onelab.eu/git/tests
---

diff --git a/system/TestSsh.py b/system/TestSsh.py
index 81b7fe8..b6ab948 100644
--- a/system/TestSsh.py
+++ b/system/TestSsh.py
@@ -170,7 +170,7 @@ class TestSsh:
     def copy (self,local_file,recursive=False,dry_run=False):
         if self.is_local():
             return 0
-        self.create_buildname_once()
+        self.create_buildname_once(dry_run)
         scp_command="scp "
         if not dry_run:
             scp_command += TestSsh.std_options
diff --git a/system/template-qemu/qemu-bridge-init b/system/template-qemu/qemu-bridge-init
index 5e0f50c..399907c 100755
--- a/system/template-qemu/qemu-bridge-init
+++ b/system/template-qemu/qemu-bridge-init
@@ -34,7 +34,7 @@ EOF
 # let's try to figure out the interface to use - try these in order
 function discover_interface () {
     for ifname in $(gather_interfaces); do
-	ip link show $ifname | grep -q UP && { INTERFACE_LAN=$ifname; return; }
+	ip link show $ifname | grep -qi 'state UP' && { INTERFACE_LAN=$ifname; return; }
     done
     # still not found ? that's bad
     INTERFACE_LAN=unknown