Merge lp:~nick-schutt/lava-dispatcher/nicks-bootloader-interactive into lp:lava-dispatcher

[Nicholas Schutt]

Add interactive boot support for master.py and highbank.py:

1. added bootcmds parameter to deploy.py for all calls to deploy_linaro and deploy_android

2. added sendline and expect support to bootcmds (taken from uefi.py, but removed escape() of special characters)

3. added code to master.py to read boot commands from a file, passed as the bootcmds parameter
    Priority: a. json bootcmds
               b. image bootcmds
               c. device.conf bootcmds

4. added bootcmds support to highbank.py and moved boot sequence to config file

5. added bootcmds master support to highbank.py and moved boot sequence to config file
    -> new variable, boot_cmds_master

-----

Example boot.txt:

expect Highbank \#
echo -------------------------- BEGIN BOOT CMDS ---------------
expect Highbank \#
sendline setenv initrd_high "0xffffffff"
expect Highbank \#
sendline setenv fdt_high "0xffffffff"
expect Highbank \#
sendline setenv bootcmd "ext2load scsi 0:1 0x00800000 uImage; ext2load scsi 0:1 0x01000000 uInitrd; bootm 0x00800000 0x01000000 0x00001000"
expect Highbank \#
sendline setenv bootargs "console=ttyAMA0,115200n8 nosplash root=/dev/disk/by-label/rootfs rootwait ro 1"
expect Highbank \#
echo -------------------------- BOOTING -----------------------
expect Highbank \#
sendline boot

Unmerged revisions

637. By Nicholas Schutt on 2013-05-03

remove boot_cmds from highbank config (the image takes care of this)

636. By Nicholas Schutt on 2013-05-03

remove boot_cmds from highbank config (the image takes care of this)

635. By Nicholas Schutt on 2013-05-03

remove boot_cmds from highbank config (the image takes care of this)

634. By Nicholas Schutt on 2013-05-03

remove boot_cmds from highbank config (the image takes care of this)

633. By Nicholas Schutt on 2013-05-03

merge trunk

632. By Nicholas Schutt on 2013-05-03

read file and strip newlines in one line

631. By Nicholas Schutt on 2013-05-03

read file and strip newlines in one line

630. By Nicholas Schutt on 2013-05-03

map lines without sendline/expect keyword as sendline for backward compatability

629. By Nicholas Schutt on 2013-05-03

debug boot_cmds

628. By Nicholas Schutt on 2013-05-03

remove carriage returns from boot commands file

=== modified file 'lava_dispatcher/actions/deploy.py'
--- lava_dispatcher/actions/deploy.py	2013-04-17 08:23:50 +0000
+++ lava_dispatcher/actions/deploy.py	2013-05-22 14:07:36 +0000
@@ -53,6 +53,7 @@
             'hwpack': {'type': 'string', 'optional': True},
             'rootfs': {'type': 'string', 'optional': True},
             'image': {'type': 'string', 'optional': True},
+            'bootcmds': {'type': 'string', 'optional': True},
             'rootfstype': {'type': 'string', 'optional': True},
             'bootloader': {'type': 'string', 'optional': True, 'default': 'u_boot'},
             },
@@ -70,9 +71,10 @@
         elif 'image' not in parameters:
             raise ValueError('must specify image if not specifying a hwpack')
 
-    def run(self, hwpack=None, rootfs=None, image=None, rootfstype='ext3', bootloader='u_boot'):
+    def run(self, hwpack=None, rootfs=None, image=None, rootfstype='ext3', bootloader='u_boot', bootcmds=None):
         self.client.deploy_linaro(
-            hwpack=hwpack, rootfs=rootfs, image=image, rootfstype=rootfstype, bootloader=bootloader)
+            hwpack=hwpack, rootfs=rootfs, image=image, rootfstype=rootfstype,
+            bootloader=bootloader, bootcmds=bootcmds)
 
 
 class cmd_deploy_linaro_android_image(BaseAction):
@@ -83,13 +85,14 @@
             'boot': {'type': 'string'},
             'system': {'type': 'string'},
             'data': {'type': 'string'},
+            'bootcmds': {'type': 'string', 'optional': True},
             'rootfstype': {'type': 'string', 'optional': True, 'default': 'ext4'},
             },
         'additionalProperties': False,
         }
 
     def run(self, boot, system, data, rootfstype='ext4'):
-        self.client.deploy_linaro_android(boot, system, data, rootfstype)
+        self.client.deploy_linaro_android(boot, system, data, rootfstype, bootcmds=bootcmds)
 
 
 class cmd_dummy_deploy(BaseAction):

=== added file 'lava_dispatcher/client/network_master.py'
--- lava_dispatcher/client/network_master.py	1970-01-01 00:00:00 +0000
+++ lava_dispatcher/client/network_master.py	2013-05-22 14:07:36 +0000
@@ -0,0 +1,149 @@
+# Copyright (C) 2013 Linaro Limited
+#
+# Author: Michael Hudson-Doyle <[e-mail]>
+# Author: Nicholas Schutt <[e-mail]>
+#
+# This file is part of LAVA Dispatcher.
+#
+# LAVA Dispatcher is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# LAVA Dispatcher is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along
+# with this program; if not, see <http://www.gnu.org/licenses>.
+
+import commands
+import logging
+import pexpect
+import sys
+import time
+import traceback
+
+import lava_dispatcher.utils as utils
+
+from lava_dispatcher.client.base import (
+    NetworkCommandRunner,
+)
+from lava_dispatcher.errors import (
+    NetworkError,
+    OperationFailed,
+    CriticalError,
+)
+
+
+class NetworkMasterCommandRunner(NetworkCommandRunner):
+    """A CommandRunner to use when the board is booted into the master image.
+    """
+    _prompt_str_includes_rc = False
+    def __init__(self, target, prompt_str_includes_rc=False):
+        super(NetworkMasterCommandRunner, self).__init__(
+            target, target.MASTER_PS1_PATTERN, prompt_str_includes_rc)
+        self._prompt_str_includes_rc = prompt_str_includes_rc
+        
+    def run(self, cmd, response=None, timeout=-1, failok=False, wait_prompt=True):
+        NetworkCommandRunner.run(self, cmd, response, timeout, failok, wait_prompt)
+        rc = None
+        if wait_prompt and not self._prompt_str_includes_rc:
+            rc = self.get_result()
+            if not failok and rc != 0:
+                raise OperationFailed(
+                    "executing %r failed with code %s" % (cmd, rc))
+        return rc
+
+    def get_result(self):
+        rc = None
+        match_id, match = self.match_id, self.match
+        NetworkCommandRunner.run(self, "echo x$?x", response='x([0-9]+)x', timeout=5)
+        if self.match_id != 0:
+            raise OperationFailed("")
+        else:
+            rc = int(self.match.group(1))
+        return rc
+
+    def get_master_ip(self):
+        logging.info("Waiting for network to come up")
+        try:
+            self.wait_network_up(timeout=20)
+        except NetworkError:
+            logging.exception("Unable to reach LAVA server")
+            raise
+
+        ip_pat = '\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}'
+        cmd = ("ifconfig %s | grep 'inet addr' | awk -F: '{print $2}' |"
+                "awk '{print \"<\" $1 \">\"}'" %
+                self._client.config.default_network_interface)
+        self.run(cmd, response='(%s)' % ip_pat, wait_prompt=False)
+        if self.match_id != 0:
+            msg = "Unable to determine master image IP address"
+            logging.error(msg)
+            raise CriticalError(msg)
+        ip = self.match.group(1)
+        logging.debug("Master image IP is %s" % ip)
+        self.master_ip = ip
+        return ip
+
+    def get_device_version(self):
+        pattern = 'device_version=(\d+-\d+/\d+-\d+)'
+        self.run("echo \"device_version="
+                 "$(lava-master-image-info --master-image-hwpack "
+                 "| sed 's/[^0-9-]//g; s/^-\+//')"
+                 "/"
+                 "$(lava-master-image-info --master-image-rootfs "
+                 "| sed 's/[^0-9-]//g; s/^-\+//')"
+                 "\"",
+                 [pattern, pexpect.EOF, pexpect.TIMEOUT],
+                 timeout = 5)
+        device_version = None
+        if self.match_id == 0:
+            device_version = self.match.group(1)
+            logging.debug('Master image version (hwpack/rootfs) is %s' % device_version)
+        else:
+            logging.warning('Could not determine image version!')
+        return device_version
+
+    def has_partition_with_label(self, label):
+        if not label:
+            return False
+
+        path = '/dev/disk/by-label/%s' % label
+        return self.is_file_exist(path)
+
+    def is_file_exist(self, path):
+        cmd = 'ls %s > /dev/null' % path
+        rc = self.run(cmd, failok=True)
+        if rc == 0:
+            return True
+        return False
+
+    def start_http_server(self, port=80):
+        master_ip = self.get_master_ip()
+        # busybox produces no output to parse for, so let it run as a daemon
+        self.run('busybox httpd -v -p %s' % port)
+        url_base = "http://%s:%s" % (master_ip, port)
+        return url_base
+
+    def stop_http_server(self):
+        self.run('killall busybox')
+
+    def target_wget_extract(self, tar_url, dest, timeout=-1):
+        decompression_cmd = ''
+        if tar_url.endswith('.gz') or tar_url.endswith('.tgz'):
+            decompression_cmd = '| /bin/gzip -dc'
+        elif tar_url.endswith('.bz2'):
+            decompression_cmd = '| /bin/bzip2 -dc'
+        elif tar_url.endswith('.tar'):
+            decompression_cmd = ''
+        else:
+            raise RuntimeError('bad file extension: %s' % tar_url)
+
+        self.run('wget -O - %s %s | /bin/tar -C %s -xmf -'
+            % (tar_url, decompression_cmd, dest),
+            timeout=timeout)
+	    

=== modified file 'lava_dispatcher/client/targetdevice.py'
--- lava_dispatcher/client/targetdevice.py	2013-04-23 09:06:25 +0000
+++ lava_dispatcher/client/targetdevice.py	2013-05-22 14:07:36 +0000
@@ -46,11 +46,11 @@
         super(TargetBasedClient, self).__init__(context, config)
         self.target_device = get_target(context, config)
 
-    def deploy_linaro_android(self, boot, system, data, rootfstype='ext4'):
-        self.target_device.deploy_android(boot, system, data)
+    def deploy_linaro_android(self, boot, system, data, rootfstype='ext4', bootcmds=None):
+        self.target_device.deploy_android(boot, system, data, bootcmds=bootcmds)
 
     def deploy_linaro(self, hwpack=None, rootfs=None, image=None,
-                      rootfstype='ext3', bootloader='u_boot'):
+                      rootfstype='ext3', bootloader='u_boot', bootcmds=None):
         if image is None:
             if hwpack is None or rootfs is None:
                 raise CriticalError(
@@ -60,9 +60,9 @@
                     "cannot specify hwpack or rootfs when specifying image")
 
         if image is None:
-            self.target_device.deploy_linaro(hwpack, rootfs, bootloader)
+            self.target_device.deploy_linaro(hwpack, rootfs, bootloader, bootcmds=bootcmds)
         else:
-            self.target_device.deploy_linaro_prebuilt(image)
+            self.target_device.deploy_linaro_prebuilt(image, bootcmds=bootcmds)
 
     def _boot_linaro_image(self):
         if self.proc:

=== modified file 'lava_dispatcher/config.py'
--- lava_dispatcher/config.py	2013-05-16 01:53:21 +0000
+++ lava_dispatcher/config.py	2013-05-22 14:07:36 +0000
@@ -30,6 +30,7 @@
     android_binary_drivers = schema.StringOption()
     cts_media_url = schema.StringOption()
     boot_cmds = schema.StringOption(fatal=True)  # Can do better here
+    boot_cmds_master = schema.StringOption(fatal=True)  # And here
     boot_cmds_android = schema.StringOption(fatal=True)  # And here
     boot_cmds_oe = schema.StringOption(fatal=True)  # And here?
     read_boot_cmds_from_image = schema.BoolOption(default=True)

=== modified file 'lava_dispatcher/default-config/lava-dispatcher/device-defaults.conf'
--- lava_dispatcher/default-config/lava-dispatcher/device-defaults.conf	2013-05-14 18:58:37 +0000
+++ lava_dispatcher/default-config/lava-dispatcher/device-defaults.conf	2013-05-22 14:07:36 +0000
@@ -16,13 +16,18 @@
 
 pre_connect_command =
 
-# The bootloader commands to boot the device into the test image (we
-# assume that the device boots into the master image without bootloader
-# intervention).
+# The bootloader commands to boot the device into the test image.
 #
 # XXX should be called # boot_test_image_commands ?
 boot_cmds =
 
+# The bootloader commands to boot the device into the master image (if
+# this is not defined, we assume that the device boots into the master
+# image without bootloader intervention).
+#
+# XXX should be called # boot_master_image_commands ?
+boot_cmds_master =
+
 # The bootloader commands to boot the device into an android-based test
 # image.
 #

=== modified file 'lava_dispatcher/default-config/lava-dispatcher/device-types/highbank.conf'
--- lava_dispatcher/default-config/lava-dispatcher/device-types/highbank.conf	2013-02-14 03:14:34 +0000
+++ lava_dispatcher/default-config/lava-dispatcher/device-types/highbank.conf	2013-05-22 14:07:36 +0000
@@ -1,2 +1,28 @@
 client_type = highbank
 connection_command = ipmitool -I lanplus -U admin -P admin -H %(ecmeip)s sol activate
+
+interrupt_boot_prompt = Hit any key to stop autoboot:
+
+boot_cmds_master = expect Highbank \#,
+    sendline dhcp,
+    expect Highbank \#,
+    sendline pxe get,
+    expect Highbank \#,
+    sendline pxe boot,
+    expect Enter choice:,
+    sendline 1,
+    expect \(initramfs\),
+    sendline . /scripts/functions,
+    expect \(initramfs\),
+    sendline DEVICE=eth0 configure_networking,
+    expect \(initramfs\),
+    sendline mkdir -p /var/run /var/lib/dhcp /usr/sbin,
+    expect \(initramfs\),
+    sendline dhclient -v -1,
+    expect \(initramfs\),
+    sendline bash,
+    expect \(initramfs\),
+    sendline /bin/busybox --install -s
+
+master_str = \(initramfs\)
+

=== modified file 'lava_dispatcher/device/fastmodel.py'
--- lava_dispatcher/device/fastmodel.py	2013-03-25 20:23:35 +0000
+++ lava_dispatcher/device/fastmodel.py	2013-05-22 14:07:36 +0000
@@ -110,7 +110,7 @@
 
         self._customize_android()
 
-    def deploy_linaro(self, hwpack=None, rootfs=None, bootloader='u_boot'):
+    def deploy_linaro(self, hwpack=None, rootfs=None, bootloader='u_boot', bootcmds=None):
         hwpack = download_image(hwpack, self.context, decompress=False)
         rootfs = download_image(rootfs, self.context, decompress=False)
         odir = os.path.dirname(rootfs)
@@ -128,7 +128,7 @@
 
         self._customize_linux(self._sd_image)
 
-    def deploy_linaro_prebuilt(self, image):
+    def deploy_linaro_prebuilt(self, image, bootcmds=None):
         self._sd_image = download_image(image, self.context)
         self._copy_axf(self.config.root_part, 'boot')
 

=== modified file 'lava_dispatcher/device/highbank.py'
--- lava_dispatcher/device/highbank.py	2013-05-15 18:17:02 +0000
+++ lava_dispatcher/device/highbank.py	2013-05-22 14:07:36 +0000
@@ -24,11 +24,14 @@
 import os
 import pexpect
 import time
+import re
 
 from lava_dispatcher import tarballcache
+from lava_dispatcher.device import boot_options
 
 from lava_dispatcher.device.master import (
     MasterCommandRunner,
+    MasterImageTarget,
 )
 from lava_dispatcher.device.target import (
     Target
@@ -44,6 +47,7 @@
     )
 from lava_dispatcher.utils import (
     mk_targz,
+    string_to_list,
     rmtree,
 )
 from lava_dispatcher.client.lmc_utils import (
@@ -52,43 +56,53 @@
 from lava_dispatcher.ipmi import IpmiPxeBoot
 
 
-class HighbankTarget(Target):
-
-    MASTER_PS1 = 'root@master [rc=$(echo \$?)]# '
-    MASTER_PS1_PATTERN = 'root@master \[rc=(\d+)\]# '
+class HighbankTarget(MasterImageTarget):
 
     def __init__(self, context, config):
         super(HighbankTarget, self).__init__(context, config)
-        self.proc = self.context.spawn(self.config.connection_command, timeout=1200)
-        self.device_version = None
+        self.bootcontrol = IpmiPxeBoot(context, self.config.ecmeip)
+        Target.ubuntu_deployment_data['boot_cmds_master'] = 'boot_cmds_master'
+        Target.oe_deployment_data['boot_cmds_master'] = 'boot_cmds_master'
+        Target.fedora_deployment_data['boot_cmds_master'] = 'boot_cmds_master'
+        Target.android_deployment_data['boot_cmds_master'] = 'boot_cmds_master'
+
+    def connect_to_target(self):
         if self.config.ecmeip == None:
             msg = "The ecmeip address is not set for this target"
             logging.error(msg)
             raise CriticalError(msg)
-        self.bootcontrol = IpmiPxeBoot(context, self.config.ecmeip)
-
-    def get_device_version(self):
-        return self.device_version
-
-    def power_on(self):
-        self.bootcontrol.power_on_boot_image()
-        return self.proc
+        return self.context.spawn(self.config.connection_command, timeout=1200)
 
     def power_off(self, proc):
         self.bootcontrol.power_off()
 
-    def deploy_linaro(self, hwpack, rfs, bootloader):
+    def _soft_reboot(self):
+        self._hard_reboot()
+
+    def _hard_reboot(self):
+        self.bootcontrol.ipmitool.power_on()
+        self.bootcontrol.ipmitool.reset()
+
+    def deploy_linaro(self, hwpack, rfs, bootloader, bootcmds=None):
         image_file = generate_image(self, hwpack, rfs, self.scratch_dir, bootloader,
                                     extra_boot_args='1', image_size='1G')
         self._customize_linux(image_file)
-        self._deploy_image(image_file, '/dev/sda')
+        if bootcmds != None:
+            self._read_boot_cmds_from_file(bootcmds)
+#        self._read_boot_cmds(boot_tgz=boot_tgz)
+        self._deploy_image_dd(image_file, '/dev/sda')
 
-    def deploy_linaro_prebuilt(self, image):
+    def deploy_linaro_prebuilt(self, image, bootcmds=None):
         image_file = download_image(image, self.context, self.scratch_dir)
+        data = 'ubuntu'
+        self.deployment_data = self.target_map[data]
         self._customize_linux(image_file)
-        self._deploy_image(image_file, '/dev/sda')
+        if bootcmds != None:
+            self._read_boot_cmds_from_file(bootcmds)
+#        self._read_boot_cmds(boot_tgz=boot_tgz)
+        self._deploy_image_dd(image_file, '/dev/sda')
 
-    def _deploy_image(self, image_file, device):
+    def _deploy_image_dd(self, image_file, device):
         with self._as_master() as runner:
 
             # erase the first part of the disk to make sure the new deploy works
@@ -96,7 +110,7 @@
 
             # compress the image to reduce the transfer size
             if not image_file.endswith('.bz2') and not image_file.endswith('gz'):
-                os.system('bzip2 -9v ' + image_file)
+                os.system('bzip2 -v ' + image_file)
                 image_file += '.bz2'
 
             tmpdir = self.context.config.lava_image_tmpdir
@@ -137,8 +151,12 @@
                 'unknown master image partition(%d)' % partition)
         return partition
 
+<<<<<<< TREE
     def resize_rootfs_partition(self, runner):
         partno = self.config.root_part
+=======
+    def resize_rootfs_partition(self, runner, partno = '2'):
+>>>>>>> MERGE-SOURCE
         start = None
 
         runner.run('parted -s /dev/sda print', 
@@ -160,6 +178,7 @@
             else:
                 logging.warning("unknown partition type for resize: %s" % parttype)
 
+<<<<<<< TREE
     @contextlib.contextmanager
     def file_system(self, partition, directory):
         logging.info('attempting to access master filesystem %r:%s' %
@@ -228,20 +247,40 @@
         runner.run('wget -O - %s %s | /bin/tar -C %s -xmf -'
             % (tar_url, decompression_cmd, dest),
             timeout=timeout)
+=======
+    def _boot_linaro_image(self):
+        self.bootcontrol.ipmitool.set_to_boot_from_disk()
+        super(HighbankTarget,self)._boot_linaro_image()
+
+>>>>>>> MERGE-SOURCE
 
     @contextlib.contextmanager
     def _as_master(self):
-        self.bootcontrol.power_on_boot_master()
-
-        # Two reboots seem to be necessary to ensure that pxe boot is used.
-        # Need to identify the cause and fix it
-        self.proc.expect("Hit any key to stop autoboot:")
-        self.proc.sendline('')
-        self.bootcontrol.power_reset_boot_master()
-
-        self.proc.expect("\(initramfs\)")
+        """A session that can be used to run commands in the master image."""
+        self.boot_master_image()
+        yield MasterCommandRunner(self)
+
+    def boot_master_image(self):
+        boot_cmds_master = self.deployment_data['boot_cmds_master']
+
+        options = boot_options.as_dict(self, defaults={'boot_cmds_master': boot_cmds_master})
+        if 'boot_cmds_master' in options:
+            boot_cmds_master = options['boot_cmds_master'].value
+
+        boot_cmds_master = self.config.cp.get('__main__', boot_cmds_master)
+        boot_cmds_master = string_to_list(boot_cmds_master.encode('ascii'))
+
+        logging.info('boot_cmds_master attribute: %s', boot_cmds_master)
+
+        self.bootcontrol.ipmitool.set_to_boot_from_pxe()
+
+        self._boot(boot_cmds_master)
+
+        self.proc.expect(self.config.master_str, timeout=300)
+
         self.proc.sendline('export PS1="%s"' % self.MASTER_PS1)
         self.proc.expect(self.MASTER_PS1_PATTERN, timeout=180, lava_no_logging=1)
+<<<<<<< TREE
         runner = HBMasterCommandRunner(self)
 
         runner.run(". /scripts/functions")
@@ -259,42 +298,10 @@
         runner.run("mkdir -p /var/lib/dhcp")
         runner.run("dhclient -v -1")
 
+=======
+        runner = MasterCommandRunner(self)
+>>>>>>> MERGE-SOURCE
         self.device_version = runner.get_device_version()
 
-        try:
-            yield runner
-        finally:
-           logging.debug("deploy done")
-
-
 target_class = HighbankTarget
 
-
-class HBMasterCommandRunner(MasterCommandRunner):
-    """A CommandRunner to use when the target is booted into the master image.
-    """
-    http_pid = None
-    
-    def __init__(self, target):
-        super(HBMasterCommandRunner, self).__init__(target)
-
-    def start_http_server(self):
-        master_ip = self.get_master_ip()
-        if self.http_pid != None:
-            raise OperationFailed("busybox httpd already running with pid %" % self.http_pid)
-        # busybox produces no output to parse for, so run it in the bg and get its pid
-        self.run('busybox httpd -f &')
-        self.run('echo pid:$!:pid',response="pid:(\d+):pid",timeout=10)
-        if self.match_id != 0:
-            raise OperationFailed("busybox httpd did not start")
-        else:
-            self.http_pid = self.match.group(1)
-        url_base = "http://%s" % (master_ip)
-        return url_base
-
-    def stop_http_server(self):
-        if self.http_pid == None:
-            raise OperationFailed("busybox httpd not running, but stop_http_server called.")
-        self.run('kill %s' % self.http_pid)
-        self.http_pid = None
-

=== modified file 'lava_dispatcher/device/master.py'
--- lava_dispatcher/device/master.py	2013-05-20 06:37:29 +0000
+++ lava_dispatcher/device/master.py	2013-05-22 14:07:36 +0000
@@ -75,7 +75,7 @@
         Target.ubuntu_deployment_data['boot_cmds'] = 'boot_cmds'
         Target.oe_deployment_data['boot_cmds'] = 'boot_cmds_oe'
         Target.fedora_deployment_data['boot_cmds'] = 'boot_cmds'
-
+        
         # used for tarballcache logic to get proper boot_cmds
         Target.ubuntu_deployment_data['data_type'] = 'ubuntu'
         Target.oe_deployment_data['data_type'] = 'oe'
@@ -93,8 +93,11 @@
         if config.pre_connect_command:
             self.context.run_command(config.pre_connect_command)
 
-        self.proc = connect_to_serial(self.context)
+        self.proc = self.connect_to_target()
 
+    def connect_to_target(self):
+        return connect_to_serial(self.context)
+        
     def get_device_version(self):
         return self.device_version
 
@@ -106,16 +109,18 @@
         # we always leave master image devices powered on
         pass
 
-    def deploy_linaro(self, hwpack, rfs, bootloader):
+    def deploy_linaro(self, hwpack, rfs, bootloader, bootcmds=None):
         self.boot_master_image()
 
         image_file = generate_image(self, hwpack, rfs, self.scratch_dir, bootloader)
         (boot_tgz, root_tgz, data) = self._generate_tarballs(image_file)
 
+        if bootcmds != None:
+            self._read_boot_cmds_from_file(bootcmds)
         self._read_boot_cmds(boot_tgz=boot_tgz)
         self._deploy_tarballs(boot_tgz, root_tgz)
 
-    def deploy_android(self, boot, system, userdata):
+    def deploy_android(self, boot, system, userdata, bootcmds=None):
         self.boot_master_image()
 
         sdir = self.scratch_dir
@@ -123,6 +128,9 @@
         system = download_image(system, self.context, sdir, decompress=False)
         data = download_image(userdata, self.context, sdir, decompress=False)
 
+        if bootcmds != None:
+            self._read_boot_cmds_from_file(bootcmds)
+
         with self._as_master() as master:
             self._format_testpartition(master, 'ext4')
             self._deploy_android_tarballs(master, boot, system, data)
@@ -149,7 +157,7 @@
         _deploy_linaro_android_system(master, system_url)
         _deploy_linaro_android_data(master, data_url)
 
-    def deploy_linaro_prebuilt(self, image):
+    def deploy_linaro_prebuilt(self, image, bootcmds=None):
         self.boot_master_image()
 
         if self.context.job_data.get('health_check', False):
@@ -160,6 +168,8 @@
             image_file = download_image(image, self.context, self.scratch_dir)
             (boot_tgz, root_tgz, data) = self._generate_tarballs(image_file)
 
+        if bootcmds != None:
+            self._read_boot_cmds_from_file(bootcmds)
         self._read_boot_cmds(boot_tgz=boot_tgz)
         self._deploy_tarballs(boot_tgz, root_tgz)
 
@@ -205,6 +215,15 @@
         
         return boot_cmds.split('\n')
 
+    def _read_boot_cmds_from_file(self, cmdfile, keyname='boot_cmds_from_file'):
+        # If we have already obtained boot commands dynamically, then return.
+        if self.deployment_data.get(keyname, False):
+            logging.debug("We have already read boot commands from a file")
+            return
+        sdir = self.scratch_dir
+        bootcmd_file = download_image(cmdfile, self.context, sdir, decompress=True)
+        self.deployment_data[keyname] = [line.rstrip('\n') for line in open(bootcmd_file)]
+    
     def _read_boot_cmds(self, image=None, boot_tgz=None):
         boot_file_path = None
 
@@ -326,6 +345,7 @@
         assert directory != '/', "cannot mount entire partition"
 
         with self._as_master() as runner:
+            runner.run('mkdir -p /mnt')
             partition = self.get_partition(runner, partition)
             runner.run('mount %s /mnt' % partition)
             try:
@@ -338,17 +358,10 @@
                 runner.run('tar -czf /tmp/fs.tgz -C %s %s' %
                     (parent_dir, target_name))
                 runner.run('cd /tmp')  # need to be in same dir as fs.tgz
-                self.proc.sendline('python -m SimpleHTTPServer 0 2>/dev/null')
-                match_id = self.proc.expect([
-                    'Serving HTTP on 0.0.0.0 port (\d+) \.\.',
-                    pexpect.EOF, pexpect.TIMEOUT])
-                if match_id != 0:
-                    msg = "Unable to start HTTP server on master"
-                    logging.error(msg)
-                    raise CriticalError(msg)
-                port = self.proc.match.groups()[match_id]
-
-                url = "http://%s:%s/fs.tgz" % (self.master_ip, port)
+
+                url_base = runner.start_http_server()
+
+                url = url_base + '/fs.tgz'
                 tf = download_with_retry(
                     self.context, self.scratch_dir, url, False)
 
@@ -363,7 +376,7 @@
                     mk_targz(tf, tfdir)
                     rmtree(tfdir)
 
-                    self.proc.sendcontrol('c')  # kill SimpleHTTPServer
+	            runner.stop_http_server()
 
                     # get the last 2 parts of tf, ie "scratchdir/tf.tgz"
                     tf = '/'.join(tf.split('/')[-2:])
@@ -372,7 +385,7 @@
                     self.target_extract(runner, url, parent_dir)
 
             finally:
-                    self.proc.sendcontrol('c')  # kill SimpleHTTPServer
+	            runner.stop_http_server()
                     runner.run('umount /mnt')
 
     def extract_tarball(self, tarball_url, partition, directory='/'):
@@ -488,40 +501,52 @@
         self.proc.sendline(self.config.interrupt_boot_command)
 
     def _boot_linaro_image(self):
-        boot_cmds = self.deployment_data['boot_cmds']
-        boot_cmds_override = False
-
-        options = boot_options.as_dict(self, defaults={'boot_cmds': boot_cmds})
-        if 'boot_cmds' in options:
-            boot_cmds_override = True
-            boot_cmds = options['boot_cmds'].value
-
-        logging.info('boot_cmds attribute: %s', boot_cmds)
-
-        # Check if we have already got some values from image's boot file.
-        if self.deployment_data.get('boot_cmds_dynamic') \
-           and not boot_cmds_override:
+        # Check if we have already got some values from the test or from
+        # the image's boot file.
+        if self.deployment_data.get('boot_cmds_from_file', False):
+            boot_cmds = self.deployment_data['boot_cmds_from_file']
+            logging.info('boot_cmds_from_file: %s', boot_cmds)
+        elif self.deployment_data.get('boot_cmds_dynamic', False):
             logging.info('Loading boot_cmds from image')
             boot_cmds = self.deployment_data['boot_cmds_dynamic']
         else:
+            boot_cmds = self.deployment_data['boot_cmds']
+            options = boot_options.as_dict(self, defaults={'boot_cmds': boot_cmds})
+            if 'boot_cmds' in options:
+                boot_cmds = options['boot_cmds'].value
             logging.info('Loading boot_cmds from device configuration')
             boot_cmds = self.config.cp.get('__main__', boot_cmds)
             boot_cmds = string_to_list(boot_cmds.encode('ascii'))
 
+        logging.info('boot_cmds attribute: %s', boot_cmds)
+
         self._boot(boot_cmds)
 
     def _boot(self, boot_cmds):
-        try:
-            self._soft_reboot()
-            self._enter_bootloader()
-        except:
-            logging.exception("_enter_bootloader failed")
-            self._hard_reboot()
-            self._enter_bootloader()
-        self.proc.sendline(boot_cmds[0])
-        for line in range(1, len(boot_cmds)):
-            self.proc.expect(self.config.bootloader_prompt, timeout=300)
-            self.proc.sendline(boot_cmds[line])
+        self._soft_reboot()
+        if len(boot_cmds) > 0:
+            try:
+                self._enter_bootloader()
+            except:
+                logging.exception("_enter_bootloader failed")
+                self._hard_reboot()
+                self._enter_bootloader()
+        for line in range(0, len(boot_cmds)):
+            parts = re.match('^(?P<action>sendline|expect)\s*(?P<command>.*)', boot_cmds[line])
+            try:
+                action = parts.group('action')
+                command = parts.group('command')
+            except AttributeError as e:
+                action = "sendline"
+                command = boot_cmds[line]
+
+            if action == "expect":
+                self.proc.expect(command, timeout=300)
+            elif action == "sendline":
+                self.proc.empty_buffer()
+                self.proc.sendline(command)
+            else:
+                raise Exception("Unrecognised action in boot_cmds")
 
 
 target_class = MasterImageTarget
@@ -530,6 +555,7 @@
 class MasterCommandRunner(NetworkCommandRunner):
     """A CommandRunner to use when the board is booted into the master image.
     """
+    http_pid = None
 
     def __init__(self, target):
         super(MasterCommandRunner, self).__init__(
@@ -593,6 +619,26 @@
             return True
         return False
 
+    def start_http_server(self):
+        master_ip = self.get_master_ip()
+        if self.http_pid != None:
+            raise OperationFailed("busybox httpd already running with pid %" % self.http_pid)
+        # busybox produces no output to parse for, so run it in the bg and get its pid
+        self.run('busybox httpd -f &')
+        self.run('echo pid:$!:pid',response="pid:(\d+):pid",timeout=10)
+        if self.match_id != 0:
+            raise OperationFailed("busybox httpd did not start")
+        else:
+            self.http_pid = self.match.group(1)
+        url_base = "http://%s" % (master_ip)
+        return url_base
+
+    def stop_http_server(self):
+        if self.http_pid != None:
+            self.run('kill %s' % self.http_pid)
+            self.http_pid = None
+
+
 
 def _extract_partition(image, partno, tarfile):
     """Mount a partition and produce a tarball of it

=== modified file 'lava_dispatcher/device/qemu.py'
--- lava_dispatcher/device/qemu.py	2013-02-18 03:06:06 +0000
+++ lava_dispatcher/device/qemu.py	2013-05-22 14:07:36 +0000
@@ -45,12 +45,12 @@
         super(QEMUTarget, self).__init__(context, config)
         self._sd_image = None
 
-    def deploy_linaro(self, hwpack=None, rootfs=None, bootloader='u_boot'):
+    def deploy_linaro(self, hwpack=None, rootfs=None, bootloader='u_boot', bootcmds=None):
         odir = self.scratch_dir
         self._sd_image = generate_image(self, hwpack, rootfs, odir, bootloader)
         self._customize_linux(self._sd_image)
 
-    def deploy_linaro_prebuilt(self, image):
+    def deploy_linaro_prebuilt(self, image, bootcmds=None):
         self._sd_image = download_image(image, self.context)
         self._customize_linux(self._sd_image)
 

=== modified file 'lava_dispatcher/device/sdmux.py'
--- lava_dispatcher/device/sdmux.py	2013-04-02 16:16:18 +0000
+++ lava_dispatcher/device/sdmux.py	2013-05-22 14:07:36 +0000
@@ -88,12 +88,12 @@
         if config.pre_connect_command:
             self.context.run_command(config.pre_connect_command)
 
-    def deploy_linaro(self, hwpack=None, rootfs=None):
+    def deploy_linaro(self, hwpack=None, rootfs=None, bootcmds=None):
         img = generate_image(self, hwpack, rootfs, self.scratch_dir)
         self._customize_linux(img)
         self._write_image(img)
 
-    def deploy_linaro_prebuilt(self, image):
+    def deploy_linaro_prebuilt(self, image, bootcmds=None):
         img = download_image(image, self.context)
         self._customize_linux(img)
         self._write_image(img)

=== modified file 'lava_dispatcher/device/target.py'
--- lava_dispatcher/device/target.py	2013-04-19 08:40:29 +0000
+++ lava_dispatcher/device/target.py	2013-05-22 14:07:36 +0000
@@ -40,6 +40,8 @@
 
     ANDROID_TESTER_PS1 = "root@linaro# "
 
+    _scratch_dir = None
+
     # The target deployment functions will point self.deployment_data to
     # the appropriate dictionary below. Code such as actions can contribute
     # to these structures with special handling logic
@@ -85,13 +87,13 @@
         """
         raise NotImplementedError('power_on')
 
-    def deploy_linaro(self, hwpack, rfs):
+    def deploy_linaro(self, hwpack, rfs, bootcmds=None):
         raise NotImplementedError('deploy_image')
 
-    def deploy_android(self, boot, system, userdata):
+    def deploy_android(self, boot, system, userdata, bootcmds=None):
         raise NotImplementedError('deploy_android_image')
 
-    def deploy_linaro_prebuilt(self, image):
+    def deploy_linaro_prebuilt(self, image, bootcmds=None):
         raise NotImplementedError('deploy_linaro_prebuilt')
 
     def power_off(self, proc):