Merge branch 'master' into 'master'

Add hurd-i386 EFI support.

See merge request images-team/debian-cd!5
This commit is contained in:
Steve McIntyre 2019-11-18 11:42:12 +00:00
commit 89236b979e
3 changed files with 66 additions and 16 deletions

4
debian/changelog vendored
View File

@ -4,6 +4,10 @@ debian-cd (3.1.28) UNRELEASED; urgency=medium
* Add a "with firmware" text to the DISKINFO string when appropriate
Closes: #944207
[ Samuel Thibault ]
* Drop support for xorriso versions before 1.2.2
* Add hurd-i386 EFI support.
-- Holger Levsen <holger@debian.org> Wed, 23 Oct 2019 18:06:41 +0200
debian-cd (3.1.27) unstable; urgency=medium

View File

@ -12,6 +12,26 @@
set -e
#set -x
# Have we been told to use just one boot method? If none listed,
# assume all are desired. Order also matters. Possible values are
# "BIOS", "EFI" and "BIOS EFI". We'll also accept "EFI BIOS" for
# completeness, but we will switch the order.
if [ "$BOOT_METHODS"x = ""x ] \
|| [ "$BOOT_METHODS"x = "BIOS EFI"x ] \
|| [ "$BOOT_METHODS"x = "EFI BIOS"x ] ; then
BOOT_BIOS=1
BOOT_EFI=2
elif [ "$BOOT_METHODS"x = "BIOS"x ] ; then
BOOT_BIOS=1
BOOT_EFI=0
elif [ "$BOOT_METHODS"x = "EFI"x ] ; then
BOOT_EFI=1
BOOT_BIOS=0
else
echo "ERROR: Unrecognized boot method choice $BOOT_METHODS"
exit 1
fi
N=$1
CDDIR=$2
INSTALLDIR="install"
@ -104,4 +124,44 @@ fi
# Cleanup
rm -rf cdrom
if [ $BOOT_EFI -ne 0 ] ; then
echo " Adding EFI boot code for $ARCH on CD$N"
# Move GRUB files to the right place.
mkdir -p $CDDIR/EFI/boot
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. 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)
# Now make a new image to contain the files
rm -f $CDDIR/boot/grub/efi.img
mkfs.msdos -v -C "$CDDIR/boot/grub/efi.img" $blocks >/dev/null
# And copy them into place
mmd -i "$CDDIR/boot/grub/efi.img" ::efi
mcopy -o -s -i "$CDDIR/boot/grub/efi.img" $CDDIR/EFI/* \
"::efi"
if [ $BOOT_EFI = 2 ] ; then
# We're being added alongside (after) a BIOS boot record. Tell
# xorriso to create a (secondary) ElTorito boot record for the
# EFI bootloader. Otherwise, xorriso will create it as the
# primary.
add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-eltorito-alt-boot"
fi
add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-e boot/grub/efi.img -no-emul-boot"
add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-isohybrid-gpt-basdat -isohybrid-apm-hfsplus"
else
echo " No EFI boot code for $ARCH on CD$N"
fi
# done

View File

@ -503,22 +503,8 @@ if [ -d boot$N/isolinux/grub ] && [ $BOOT_EFI -ne 0 ] ; then
add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-eltorito-alt-boot"
fi
# Ugh - different code here depending on the version of xorriso we've got
if [ $XORRISO_VER -le 10202 ] ; then
# 1.2.2 shipping in Wheezy
echo " Using older EFI command line for xorriso $XORRISO_VER"
add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "--efi-boot boot/grub/efi.img"
# Add the efi image as a FAT partition too, so our CD image will
# also boot on a USB key (like isohybrid, just implemented
# differently)
add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-append_partition 2 0x01 $CDDIR/boot/grub/efi.img"
elif [ $XORRISO_VER -gt 10202 ] ; then
echo " Using newer EFI support in xorriso $XORRISO_VER"
add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-e boot/grub/efi.img -no-emul-boot"
add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-isohybrid-gpt-basdat -isohybrid-apm-hfsplus"
fi
add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-e boot/grub/efi.img -no-emul-boot"
add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-isohybrid-gpt-basdat -isohybrid-apm-hfsplus"
else
echo " No EFI boot code for $ARCH on CD$N"
fi