diff mbox

[Branch,~linaro-validation/lava-dispatcher/trunk] Rev 226: make qemu deployment work again

Message ID 20120209203110.22670.62831.launchpad@ackee.canonical.com
State Accepted
Headers show

Commit Message

Michael-Doyle Hudson Feb. 9, 2012, 8:31 p.m. UTC 
------------------------------------------------------------
revno: 226
committer: Michael Hudson-Doyle <michael.hudson@linaro.org>
branch nick: trunk
timestamp: Thu 2012-02-09 12:29:52 -0800
message:
  make qemu deployment work again
modified:
  lava_dispatcher/client/qemu.py


--
lp:lava-dispatcher
https://code.launchpad.net/~linaro-validation/lava-dispatcher/trunk

You are subscribed to branch lp:lava-dispatcher.
To unsubscribe from this branch go to https://code.launchpad.net/~linaro-validation/lava-dispatcher/trunk/+edit-subscription
diff mbox

Patch

=== modified file 'lava_dispatcher/client/qemu.py'
--- lava_dispatcher/client/qemu.py	2011-12-19 01:44:12 +0000
+++ lava_dispatcher/client/qemu.py	2012-02-09 20:29:52 +0000
@@ -44,8 +44,11 @@ 
         super(LavaQEMUClient, self).__init__(context, config)
         self._lava_image = None
 
-    def deploy_linaro(self, hwpack, rootfs, kernel_matrix=None, use_cache=True, rootfstype='ext3'):
-        image_file = generate_image(self, hwpack, rootfs, kernel_matrix, use_cache, rootfstype)
+    def deploy_linaro(self, hwpack=None, rootfs=None, image=None, kernel_matrix=None, use_cache=True, rootfstype='ext3'):
+        if image is None:
+            image_file = generate_image(self, hwpack, rootfs, kernel_matrix, use_cache, rootfstype)
+        else:
+            image_file = image
         self._lava_image = image_file
         with image_partition_mounted(self._lava_image, self.root_part) as mntdir:
             logging_system('echo linaro > %s/etc/hostname' % mntdir)