summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lava_dispatcher/client/base.py5
-rw-r--r--lava_dispatcher/device/target.py4
2 files changed, 8 insertions, 1 deletions
diff --git a/lava_dispatcher/client/base.py b/lava_dispatcher/client/base.py
index 2c0b659..ef6c99d 100644
--- a/lava_dispatcher/client/base.py
+++ b/lava_dispatcher/client/base.py
@@ -416,7 +416,10 @@ class LavaClient(object):
just-booted system.
"""
- self.boot_linaro_image()
+ if self.target_device.target_distro != 'android':
+ self.boot_linaro_image()
+ else:
+ self.boot_linaro_android_image()
ps1_pattern = self.target_device.tester_ps1_pattern
ps1_includes_rc = self.target_device.tester_ps1_includes_rc
diff --git a/lava_dispatcher/device/target.py b/lava_dispatcher/device/target.py
index b8b2f6b..0aa5c10 100644
--- a/lava_dispatcher/device/target.py
+++ b/lava_dispatcher/device/target.py
@@ -716,6 +716,10 @@ class Target(object):
f.write('%s\n' % self.config.hostname)
@property
+ def target_distro(self):
+ return self.deployment_data['distro']
+
+ @property
def tester_ps1(self):
return self._get_from_config_or_deployment_data('tester_ps1')