1 files changed, 18 insertions, 1 deletions

diff --git a/meta/classes-recipe/image_types_wic.bbclass b/meta/classes-recipe/image_types_wic.bbclass
index 00620fdc9d..ce7125f6f1 100644
--- a/meta/classes-recipe/image_types_wic.bbclass
+++ b/meta/classes-recipe/image_types_wic.bbclass
@@ -71,7 +71,24 @@ IMAGE_CMD:wic () {
                 bbfatal "No kickstart files from WKS_FILES were found: ${WKS_FILES}. Please set WKS_FILE or WKS_FILES appropriately."
         fi
         BUILDDIR="${TOPDIR}" PSEUDO_UNLOAD=1 wic create "$wks" --vars "${STAGING_DIR}/${MACHINE}/imgdata/" -e "${IMAGE_BASENAME}" -o "$build_wic/" -w "$tmp_wic" ${WIC_CREATE_EXTRA_ARGS}
-        mv "$build_wic/$(basename "${wks%.wks}")"*.direct "$out.wic"
+
+        # look to see if the user specifies a custom imager
+        IMAGER=direct
+        eval set -- "${WIC_CREATE_EXTRA_ARGS} --"
+        while [ 1 ]; do
+                case "$1" in
+                        --imager|-i)
+                                shift
+                                IMAGER=$1
+                                ;;
+                        --)
+                                shift
+                                break
+                                ;;
+                esac
+                shift
+        done
+        mv "$build_wic/$(basename "${wks%.wks}")"*.${IMAGER} "$out.wic"
 }
 IMAGE_CMD:wic[vardepsexclude] = "WKS_FULL_PATH WKS_FILES TOPDIR"
 do_image_wic[cleandirs] = "${WORKDIR}/build-wic"