aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lava_dispatcher/connection.py2
-rw-r--r--lava_dispatcher/default-config/lava-dispatcher/device-defaults.conf2
2 files changed, 3 insertions, 1 deletions
diff --git a/lava_dispatcher/connection.py b/lava_dispatcher/connection.py
index fe75bcf56..e17de481d 100644
--- a/lava_dispatcher/connection.py
+++ b/lava_dispatcher/connection.py
@@ -98,7 +98,7 @@ class LavaConnection(object):
class LavaConmuxConnection(LavaConnection):
def _make_connection(self, sio):
- cmd = "conmux-console %s" % self.device_option("hostname")
+ cmd = self.device_option("connection_command")
proc = pexpect.spawn(cmd, timeout=1200, logfile=sio)
#serial can be slow, races do funny things if you don't increase delay
proc.delaybeforesend=1
diff --git a/lava_dispatcher/default-config/lava-dispatcher/device-defaults.conf b/lava_dispatcher/default-config/lava-dispatcher/device-defaults.conf
index 427fa95e4..35b80ba7c 100644
--- a/lava_dispatcher/default-config/lava-dispatcher/device-defaults.conf
+++ b/lava_dispatcher/default-config/lava-dispatcher/device-defaults.conf
@@ -12,6 +12,8 @@
# 'qemu' is the other possible value at this time.
client_type = master
+connection_command = conmux-console %(hostname)s
+
# The bootloader commands to boot the device into the test image (we
# assume that the device boots into the master image without bootloader
# intervention).