From ca3a146bbb0a8433d2a004f77d63facab11ed8aa Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Sun, 29 Jun 2014 17:57:32 +0200
Subject: mklive.sh: run grub-mkstandalone via xbps-uchroot(8) to avoid host
 issues.

---
 mklive.sh.in | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'mklive.sh.in')

diff --git a/mklive.sh.in b/mklive.sh.in
index c31768c..7b55791 100644
--- a/mklive.sh.in
+++ b/mklive.sh.in
@@ -186,14 +186,16 @@ generate_grub_efi_boot() {
     LOOP_DEVICE="$(losetup --show --find ${GRUB_DIR}/efiboot.img)"
     mount -o rw,flush -t vfat "${LOOP_DEVICE}" "${GRUB_EFI_TMPDIR}" >>$LOGFILE 2>&1
 
-    cd $IMAGEDIR
-    mkdir -p "${GRUB_EFI_TMPDIR}/EFI/boot/"
-    grub-mkstandalone --directory="$VOIDHOSTDIR/usr/lib/grub/x86_64-efi" \
+    cp -a $IMAGEDIR/boot $VOIDHOSTDIR
+    xbps-uchroot $VOIDHOSTDIR grub-mkstandalone --directory="/usr/lib/grub/x86_64-efi" \
         --format="x86_64-efi" \
-        --compression="xz" --output="${GRUB_EFI_TMPDIR}/EFI/boot/bootx64.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/
     rm -rf $GRUB_EFI_TMPDIR
 }
 
-- 
cgit 1.4.1