From fc84893c319f3e8c72f13c58f25e0b54095c3a49 Mon Sep 17 00:00:00 2001 From: Ed Bartosh Date: Fri, 27 Jan 2017 16:39:14 +0200 Subject: isoimage-isohybrid: renamed variable hdd_dir Renamed variable hdd_dir to deploy_dir as this variable is assigned to the value of DEPLOY_DIR_IMAGE. Signed-off-by: Ed Bartosh --- scripts/lib/wic/plugins/source/isoimage-isohybrid.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'scripts') 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): part.rootfs_dir = rootfs_dir # Prepare rootfs.img - hdd_dir = get_bitbake_var("DEPLOY_DIR_IMAGE") + deploy_dir = get_bitbake_var("DEPLOY_DIR_IMAGE") img_iso_dir = get_bitbake_var("ISODIR") rootfs_img = "%s/rootfs.img" % img_iso_dir if not os.path.isfile(rootfs_img): @@ -282,12 +282,12 @@ class IsoImagePlugin(SourcePlugin): # Support using a different initrd other than default if source_params.get('initrd'): initrd = source_params['initrd'] - if not hdd_dir: + if not deploy_dir: msger.error("Couldn't find DEPLOY_DIR_IMAGE, exiting\n") - cp_cmd = "cp %s/%s %s" % (hdd_dir, initrd, cr_workdir) + cp_cmd = "cp %s/%s %s" % (deploy_dir, initrd, cr_workdir) else: # Prepare initial ramdisk - initrd = "%s/initrd" % hdd_dir + initrd = "%s/initrd" % deploy_dir if not os.path.isfile(initrd): initrd = "%s/initrd" % img_iso_dir if not os.path.isfile(initrd): -- cgit v1.2.3