Procházet zdrojové kódy

mklive: fix regression introduced in ca3a146bb (UEFI boot not working).

The issue was that I forgot to copy the generated grubx64.efi into the
vfat image that is embedded into the ISO image, resulting in an unbootable
image on UEFI systems.

Thanks to pancake for reporting!
Juan RP před 10 roky
rodič
revize
2c3fb819ee
1 změnil soubory, kde provedl 2 přidání a 3 odebrání
  1. 2 3
      mklive.sh.in

+ 2 - 3
mklive.sh.in

@@ -191,11 +191,10 @@ generate_grub_efi_boot() {
         --format="x86_64-efi" \
         --compression="xz" --output="/tmp/bootx64.efi" \
         "boot/grub/grub.cfg" >>$LOGFILE 2>&1
-    umount "$GRUB_EFI_TMPDIR"
-    losetup --detach "${LOOP_DEVICE}"
-    cd $IMAGEDIR
     mkdir -p ${GRUB_EFI_TMPDIR}/EFI/boot
     cp -f $VOIDHOSTDIR/tmp/bootx64.efi ${GRUB_EFI_TMPDIR}/EFI/boot/
+    umount "$GRUB_EFI_TMPDIR"
+    losetup --detach "${LOOP_DEVICE}"
     rm -rf $GRUB_EFI_TMPDIR
 }