diff options
Diffstat (limited to 'scripts')
-rw-r--r-- | scripts/lib/wic/plugins/source/isoimage-isohybrid.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/lib/wic/plugins/source/isoimage-isohybrid.py b/scripts/lib/wic/plugins/source/isoimage-isohybrid.py index e4637a3283..bceaa84398 100644 --- a/scripts/lib/wic/plugins/source/isoimage-isohybrid.py +++ b/scripts/lib/wic/plugins/source/isoimage-isohybrid.py | |||
@@ -249,7 +249,7 @@ class IsoImagePlugin(SourcePlugin): | |||
249 | part.rootfs_dir = rootfs_dir | 249 | part.rootfs_dir = rootfs_dir |
250 | 250 | ||
251 | # Prepare rootfs.img | 251 | # Prepare rootfs.img |
252 | hdd_dir = get_bitbake_var("DEPLOY_DIR_IMAGE") | 252 | deploy_dir = get_bitbake_var("DEPLOY_DIR_IMAGE") |
253 | img_iso_dir = get_bitbake_var("ISODIR") | 253 | img_iso_dir = get_bitbake_var("ISODIR") |
254 | rootfs_img = "%s/rootfs.img" % img_iso_dir | 254 | rootfs_img = "%s/rootfs.img" % img_iso_dir |
255 | if not os.path.isfile(rootfs_img): | 255 | if not os.path.isfile(rootfs_img): |
@@ -282,12 +282,12 @@ class IsoImagePlugin(SourcePlugin): | |||
282 | # Support using a different initrd other than default | 282 | # Support using a different initrd other than default |
283 | if source_params.get('initrd'): | 283 | if source_params.get('initrd'): |
284 | initrd = source_params['initrd'] | 284 | initrd = source_params['initrd'] |
285 | if not hdd_dir: | 285 | if not deploy_dir: |
286 | msger.error("Couldn't find DEPLOY_DIR_IMAGE, exiting\n") | 286 | msger.error("Couldn't find DEPLOY_DIR_IMAGE, exiting\n") |
287 | cp_cmd = "cp %s/%s %s" % (hdd_dir, initrd, cr_workdir) | 287 | cp_cmd = "cp %s/%s %s" % (deploy_dir, initrd, cr_workdir) |
288 | else: | 288 | else: |
289 | # Prepare initial ramdisk | 289 | # Prepare initial ramdisk |
290 | initrd = "%s/initrd" % hdd_dir | 290 | initrd = "%s/initrd" % deploy_dir |
291 | if not os.path.isfile(initrd): | 291 | if not os.path.isfile(initrd): |
292 | initrd = "%s/initrd" % img_iso_dir | 292 | initrd = "%s/initrd" % img_iso_dir |
293 | if not os.path.isfile(initrd): | 293 | if not os.path.isfile(initrd): |