summary refs log tree commit diff
diff options
context:
space:
mode:
authorJuan RP <xtraeme@gmail.com>2014-08-02 08:53:38 +0200
committerJuan RP <xtraeme@gmail.com>2014-08-02 08:53:38 +0200
commit2c3fb819eeecc487a555158ddae00c52d08424b8 (patch)
treef2c77ab637ab837611b781110e21456012ada570
parente4434c5d51f307655afb154573fba6f184cc9884 (diff)
downloadhrmpf-2c3fb819eeecc487a555158ddae00c52d08424b8.tar.gz
hrmpf-2c3fb819eeecc487a555158ddae00c52d08424b8.tar.xz
hrmpf-2c3fb819eeecc487a555158ddae00c52d08424b8.zip
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!
-rw-r--r--mklive.sh.in5
1 files changed, 2 insertions, 3 deletions
diff --git a/mklive.sh.in b/mklive.sh.in
index 7b55791..366751d 100644
--- a/mklive.sh.in
+++ b/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
 }