place efiboot.img and macboot.img in /isolinux

livecd-tools · Jun 14, 2021 · f5d76fa · f5d76fa
1 parent c4c9dd4
commit f5d76fa
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/imgcreate/live.py b/imgcreate/live.py
@@ -238,7 +238,7 @@ def _generate_efiboot(self, isodir):
 
         # XXX-BCL: does this need --label?
         subprocess.call(["mkefiboot", isodir + "/EFI/BOOT",
-                         isodir + "/images/efiboot.img"])
+                         isodir + "/isolinux/efiboot.img"])
 
     def _create_bootconfig(self):
         """Configure the image so that it's bootable."""
@@ -385,15 +385,15 @@ def __init__(self, *args, **kwargs):
 
     def _get_xorrisofs_options(self, isodir):
         options = []
-        if os.path.exists(os.path.join(isodir, "images/efiboot.img")):
-            options += ["-eltorito-alt-boot", "-e", "images/efiboot.img",
+        if os.path.exists(os.path.join(isodir, "isolinux/efiboot.img")):
+            options += ["-eltorito-alt-boot", "-e", "isolinux/efiboot.img",
                         "-no-emul-boot", "-isohybrid-gpt-basdat",
                         "-isohybrid-mbr", "/usr/share/syslinux/isohdpfx.bin",
                         "-eltorito-boot", "isolinux/isolinux.bin",
                         "-boot-load-size", "4", "-boot-info-table",
                         "-eltorito-catalog", "isolinux/boot.cat"]
-        if os.path.exists(os.path.join(isodir, "images/macboot.img")):
-            options += ["-eltorito-alt-boot", "-e", "images/macboot.img",
+        if os.path.exists(os.path.join(isodir, "isolinux/macboot.img")):
+            options += ["-eltorito-alt-boot", "-e", "isolinux/macboot.img",
                         "-no-emul-boot", "-isohybrid-gpt-hfsplus"]
         options += ["-rational-rock", "-joliet", "-volid", self.fslabel]
         return options
@@ -831,7 +831,7 @@ def _generate_efiboot(self, isodir):
         LiveImageCreatorBase._generate_efiboot(self, isodir)
         # add macboot data
         subprocess.call(["mkefiboot", "-a", isodir + "/EFI/BOOT",
-                         isodir + "/images/macboot.img", "-l", self.product,
+                         isodir + "/isolinux/macboot.img", "-l", self.product,
                          "-n", "/usr/share/pixmaps/bootloader/fedora-media.vol",
                          "-i", "/usr/share/pixmaps/bootloader/fedora.icns",
                          "-p", self.product])