isoimage-isohybrid: Fix variable names

initrd.cpio is created in initrd_dir, not in cr_workdir. Gzip will
let initrd.cpio uncompressed if the path is not found.

Also, grub_image variable doesn't exist, grub_src_image should
be used instead.

Signed-off-by: Alexandru Vasiu <alexandru.vasiu@ni.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/scripts/lib/wic/plugins/source/isoimage-isohybrid.py b/scripts/lib/wic/plugins/source/isoimage-isohybrid.py
index 4a0a57ef9eee11bff0b5a8722eecd88b258f6ac9..25a695da1700f2d69e2dde33b71ac83616569f93 100644 (file)
--- a/scripts/lib/wic/plugins/source/isoimage-isohybrid.py
+++ b/scripts/lib/wic/plugins/source/isoimage-isohybrid.py
@@ -194,7 +194,7 @@ class IsoImagePlugin(SourcePlugin):
             exec_cmd("cd %s && find . | cpio -o -H newc -R root:root >./initrd.cpio " \
                     % initrd_dir, as_shell=True)
             exec_cmd("gzip -f -9 -c %s/initrd.cpio > %s" \
-                    % (cr_workdir, initrd), as_shell=True)
+                    % (initrd_dir, initrd), as_shell=True)
             shutil.rmtree(initrd_dir)
 
         return initrd
@@ -317,7 +317,7 @@ class IsoImagePlugin(SourcePlugin):
                     grub_src = os.path.join(deploy_dir, grub_src_image)
                     if not os.path.exists(grub_src):
                         raise WicError("Grub loader %s is not found in %s. "
-                                       "Please build grub-efi first" % (grub_image, deploy_dir))
+                                       "Please build grub-efi first" % (grub_src_image, deploy_dir))
                     shutil.copy(grub_src, grub_target)
 
                 if not os.path.isfile(os.path.join(target_dir, "boot.cfg")):