summaryrefslogtreecommitdiffstats
path: root/scripts/lib
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/lib')
-rw-r--r--scripts/lib/wic/plugins/source/isoimage-isohybrid.py10
1 files changed, 6 insertions, 4 deletions
diff --git a/scripts/lib/wic/plugins/source/isoimage-isohybrid.py b/scripts/lib/wic/plugins/source/isoimage-isohybrid.py
index d6bd3bff7b..b119c9c2fd 100644
--- a/scripts/lib/wic/plugins/source/isoimage-isohybrid.py
+++ b/scripts/lib/wic/plugins/source/isoimage-isohybrid.py
@@ -328,16 +328,18 @@ class IsoImagePlugin(SourcePlugin):
328 raise WicError("Coludn't find target architecture") 328 raise WicError("Coludn't find target architecture")
329 329
330 if re.match("x86_64", target_arch): 330 if re.match("x86_64", target_arch):
331 grub_image = "grub-efi-bootx64.efi" 331 grub_src_image = "grub-efi-bootx64.efi"
332 grub_dest_image = "bootx64.efi"
332 elif re.match('i.86', target_arch): 333 elif re.match('i.86', target_arch):
333 grub_image = "grub-efi-bootia32.efi" 334 grub_src_image = "grub-efi-bootia32.efi"
335 grub_dest_image = "bootia32.efi"
334 else: 336 else:
335 raise WicError("grub-efi is incompatible with target %s" % 337 raise WicError("grub-efi is incompatible with target %s" %
336 target_arch) 338 target_arch)
337 339
338 grub_target = os.path.join(target_dir, grub_image) 340 grub_target = os.path.join(target_dir, grub_dest_image)
339 if not os.path.isfile(grub_target): 341 if not os.path.isfile(grub_target):
340 grub_src = os.path.join(deploy_dir, grub_image) 342 grub_src = os.path.join(deploy_dir, grub_src_image)
341 if not os.path.exists(grub_src): 343 if not os.path.exists(grub_src):
342 raise WicError("Grub loader %s is not found in %s. " 344 raise WicError("Grub loader %s is not found in %s. "
343 "Please build grub-efi first" % (grub_image, deploy_dir)) 345 "Please build grub-efi first" % (grub_image, deploy_dir))