Tweak EFI common code setup some more

This commit is contained in:
Steve McIntyre 2019-03-21 14:08:35 +00:00
parent 5ebd3a8a95
commit 2baefff77e
3 changed files with 8 additions and 5 deletions

View File

@ -82,13 +82,14 @@ if [ -d boot$N/grub ] ; then
# Move GRUB files to the right place.
mkdir -p $CDDIR/EFI/boot
mcopy -n -s -i boot$N/isolinux/grub/efi.img '::efi/*' $CDDIR/EFI
mcopy -n -s -i boot$N/grub/efi.img '::efi/*' $CDDIR/EFI
mkdir -p $CDDIR/boot/grub
mv boot$N/grub/* $CDDIR/boot/grub/
rmdir boot$N/grub
# Stuff the EFI boot files into a FAT filesystem, making it as
# small as possible.
# small as possible. We end up re-packing like this in case we're
# making a multi-arch image
# First, work out how many blocks we need
blocks=$(calculate_efi_image_size $CDDIR)

View File

@ -83,13 +83,14 @@ if [ -d boot$N/grub ] ; then
# Move GRUB files to the right place.
mkdir -p $CDDIR/EFI/boot
mcopy -n -s -i boot$N/isolinux/grub/efi.img '::efi/*' $CDDIR/EFI
mcopy -n -s -i boot$N/grub/efi.img '::efi/*' $CDDIR/EFI
mkdir -p $CDDIR/boot/grub
mv boot$N/grub/* $CDDIR/boot/grub/
rmdir boot$N/grub
# Stuff the EFI boot files into a FAT filesystem, making it as
# small as possible.
# small as possible. We end up re-packing like this in case we're
# making a multi-arch image
# First, work out how many blocks we need
blocks=$(calculate_efi_image_size $CDDIR)

View File

@ -479,7 +479,8 @@ if [ -d boot$N/isolinux/grub ] && [ $BOOT_EFI -ne 0 ] ; then
echo " CD$N/boot/grub/grub.cfg has $NUM_ENTRIES boot entries defined"
# Stuff the EFI boot files into a FAT filesystem, making it as
# small as possible.
# small as possible. We end up re-packing like this in case we're
# making a multi-arch image
# First, work out how many blocks we need
blocks=$(calculate_efi_image_size $CDDIR)