Merge branch 'master' into testing

1 files changed, 6 insertions, 1 deletions

diff --git a/rumba/testbeds/jfed.py b/rumba/testbeds/jfed.py
index 5bf07d4..94a06e5 100644
--- a/rumba/testbeds/jfed.py
+++ b/rumba/testbeds/jfed.py
@@ -264,6 +264,11 @@ class Testbed(mod.Testbed):
 
             node_n.ssh_config.hostname = l_node.getAttribute("hostname")
 
+            ssh_support.execute_command(
+                self,
+                node_n.ssh_config,
+                "sudo locale-gen en_US.UTF-8 || true")
+
             for intf in intfs:
                 aux_mac_address = intf.getAttribute("mac_address")
 
@@ -294,7 +299,7 @@ class Testbed(mod.Testbed):
                     if isinstance(ipcp, mod.ShimEthIPCP):
                         if self.if_id[ipcp] == i_name:
                             ipcp.ifname = ifname
-                            if ifname is None:
+                            if ifname is None or ifname == "":
                                 logger.error("Could not determine name of node"
                                              "%s interface %s"
                                              % (node_n.name, mac))