diff options
| author | Michael Hudson-Doyle <michael.hudson@linaro.org> | 2012-01-09 16:16:32 +1300 |
|---|---|---|
| committer | Michael Hudson-Doyle <michael.hudson@linaro.org> | 2012-01-09 16:16:32 +1300 |
| commit | 05c5cbab4646f429b12b53e2fa1fe94d6168d4bf (patch) | |
| tree | d816cab623765455b80e4942f68b8420826eb7f6 | |
| parent | 9a6090a00fe1e2fdd49b4199c10268baa8093a31 (diff) | |
allow a device config to specify the command to be used to connect to a device
| -rw-r--r-- | lava_dispatcher/connection.py | 2 | ||||
| -rw-r--r-- | lava_dispatcher/default-config/lava-dispatcher/device-defaults.conf | 2 |
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). |