Unified · Split
| @@ -186,14 +186,16 @@ generate_grub_efi_boot() { · 185 unmodified lines | ||
| 186 | 186 | LOOP_DEVICE="$(losetup --show --find ${GRUB_DIR}/efiboot.img)" |
| 187 | 187 | mount -o rw,flush -t vfat "${LOOP_DEVICE}" "${GRUB_EFI_TMPDIR}" >>$LOGFILE 2>&1 |
| 188 | 188 | |
| 189 | − cd $IMAGEDIR | |
| 190 | − mkdir -p "${GRUB_EFI_TMPDIR}/EFI/boot/" | |
| 191 | − grub-mkstandalone --directory="$VOIDHOSTDIR/usr/lib/grub/x86_64-efi" \ | |
| 189 | + cp -a $IMAGEDIR/boot $VOIDHOSTDIR | |
| 190 | + xbps-uchroot $VOIDHOSTDIR grub-mkstandalone --directory="/usr/lib/grub/x86_64-efi" \ | |
| 192 | 191 | --format="x86_64-efi" \ |
| 193 | − --compression="xz" --output="${GRUB_EFI_TMPDIR}/EFI/boot/bootx64.efi" \ | |
| 192 | + --compression="xz" --output="/tmp/bootx64.efi" \ | |
| 194 | 193 | "boot/grub/grub.cfg" >>$LOGFILE 2>&1 |
| 195 | 194 | umount "$GRUB_EFI_TMPDIR" |
| 196 | 195 | losetup --detach "${LOOP_DEVICE}" |
| 196 | + cd $IMAGEDIR | |
| 197 | + mkdir -p ${GRUB_EFI_TMPDIR}/EFI/boot | |
| 198 | + cp -f $VOIDHOSTDIR/tmp/bootx64.efi ${GRUB_EFI_TMPDIR}/EFI/boot/ | |
| 197 | 199 | rm -rf $GRUB_EFI_TMPDIR |
| 198 | 200 | } |
| 199 | 201 | |