Peppermint
/
debian-cd-clone
mirror of https://salsa.debian.org/images-team/debian-cd.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Switch boot-x86 to always depend on xorriso now

This commit is contained in:
Steve McIntyre 2013-01-15 01:05:18 +00:00
parent 57a7129b8b
commit fdc90e1e3a
1 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
tools/boot/wheezy/boot-x86
View File

@ -191,7 +191,11 @@ case "$MKISOFS" in
*xorriso*)
add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-isohybrid-mbr syslinux/usr/lib/syslinux/isohdpfx.bin"
add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-partition_offset 16"
;;
;;
*)
echo "ERROR: debian-cd now depends on xorriso for making x86 bootable CDs."
exit 1;
;;
esac
# In case of a multi-arch CD the script will be called two times. The
@ -440,22 +444,14 @@ if [ -d boot$N/isolinux/grub ] ; then
mcopy -i "$CDDIR/boot/grub/efi.img" $CDDIR/efi/boot/boot*.efi \
"::efi/boot"
case "$MKISOFS" in
*xorriso*)
# Tell xorriso to create a secondary ElTorito boot record
# for the EFI bootloader
add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-eltorito-alt-boot --efi-boot boot/grub/efi.img"
# Tell xorriso to create a secondary ElTorito boot record for the
# EFI bootloader
add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-eltorito-alt-boot --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"
;;
*)
add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "--eltorito-alt-boot --efi-boot boot/grub/efi.img"
;;
esac
# 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"
else
echo " No EFI boot code for $ARCH on CD$N"
fi