Преглед на файлове

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 преди 10 години
родител
ревизия
2c3fb819ee
променени са 1 файла, в които са добавени 2 реда и са изтрити 3 реда
  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
 }