2 files changed, 11 insertions, 23 deletions

diff --git a/scripts/lib/wic/plugins/source/otaimage.py b/scripts/lib/wic/plugins/source/otaimage.py
index eef0bb4..26cfb10 100644
--- a/scripts/lib/wic/plugins/source/otaimage.py
+++ b/scripts/lib/wic/plugins/source/otaimage.py
@@ -19,10 +19,12 @@ import logging
 import os
 import sys
 
-from wic.pluginbase import SourcePlugin
+from wic.plugins.source.rawcopy import RawCopyPlugin
 from wic.utils.misc import get_bitbake_var
 
-class OTAImagePlugin(SourcePlugin):
+logger = logging.getLogger('wic')
+
+class OTAImagePlugin(RawCopyPlugin):
     """
     Add an already existing filesystem image to the partition layout.
     """
@@ -30,25 +32,6 @@ class OTAImagePlugin(SourcePlugin):
     name = 'otaimage'
 
     @classmethod
-    def do_install_disk(cls, disk, disk_name, cr, workdir, oe_builddir,
-                        bootimg_dir, kernel_dir, native_sysroot):
-        """
-        Called after all partitions have been prepared and assembled into a
-        disk image. Do nothing.
-        """
-        pass
-
-    @classmethod
-    def do_configure_partition(cls, part, source_params, cr, cr_workdir,
-                               oe_builddir, bootimg_dir, kernel_dir,
-                               native_sysroot):
-        """
-        Called before do_prepare_partition(). Possibly prepare
-        configuration files of some sort.
-        """
-        pass
-
-    @classmethod
     def do_prepare_partition(cls, part, source_params, cr, cr_workdir,
                              oe_builddir, bootimg_dir, kernel_dir,
                              rootfs_dir, native_sysroot):
@@ -65,5 +48,10 @@ class OTAImagePlugin(SourcePlugin):
         src = bootimg_dir + "/" + get_bitbake_var("IMAGE_LINK_NAME") + ".otaimg"
 
         logger.debug('Preparing partition using image %s' % (src))
-        part.prepare_rootfs_from_fs_image(cr_workdir, src, "")
+        source_params['file'] = src
+
+        super(OTAImagePlugin, cls).do_prepare_partition(part, source_params,
+                                                         cr, cr_workdir, oe_builddir,
+                                                         bootimg_dir, kernel_dir,
+                                                         rootfs_dir, native_sysroot)
 
diff --git a/scripts/run-qemu-ota b/scripts/run-qemu-ota
index 5334814..641296c 100755
--- a/scripts/run-qemu-ota
+++ b/scripts/run-qemu-ota
@@ -161,7 +161,7 @@ def main():
         if args.dry_run:
             print(" ".join(img_cmdline))
         else:
-            Popen(img_cmdline)
+            Popen(img_cmdline).wait()
 
     if args.dry_run:
         print(" ".join(cmdline))