diff options
| author | Sander Vrijders <sander.vrijders@ugent.be> | 2018-01-19 11:21:48 +0100 |
|---|---|---|
| committer | Sander Vrijders <sander.vrijders@ugent.be> | 2018-01-19 11:21:48 +0100 |
| commit | 0df3cfea491dd5ec589645ded20600c88a8a0fc1 (patch) | |
| tree | 5d78d14fa515a23d70719b06a966eb728d8c5f07 | |
| parent | 2339186cd753a9d3ea7e3c081c9991d3368077c5 (diff) | |
| parent | 13cf5c0ec0f273f2a866e852047767c51c6a138b (diff) | |
| download | rumba-0df3cfea491dd5ec589645ded20600c88a8a0fc1.tar.gz rumba-0df3cfea491dd5ec589645ded20600c88a8a0fc1.zip | |
Merge branch 'master' into testing
| -rw-r--r-- | rumba/testbeds/jfed.py | 7 |
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)) |