From 3b2a8b988fda3ee0e045139035363003cebde691 Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Tue, 16 Apr 2013 15:46:45 +0200 Subject: [PATCH] fixes --- system/TestSsh.py | 2 +- system/template-qemu/qemu-bridge-init | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 -- 2.43.0