The d-i supplied grub.cfg has the correct entries in it already
This commit is contained in:
parent
3855c0f58e
commit
775d4ecfe0
|
@ -25,6 +25,7 @@ debian-cd (3.1.16) UNRELEASED; urgency=medium
|
|||
|
||||
[ Ian Campbell ]
|
||||
* Force MKISOFO=xorriso for arm64 too
|
||||
* The d-i supplied grub.cfg has the correct entries in it already
|
||||
|
||||
-- Steve McIntyre <93sam@debian.org> Thu, 07 Aug 2014 01:45:01 +0100
|
||||
|
||||
|
|
|
@ -89,18 +89,11 @@ if [ -d boot$N/grub ] ; then
|
|||
mv boot$N/grub/* $CDDIR/boot/grub/
|
||||
rmdir boot$N/grub
|
||||
|
||||
# TODO: setup grub.cfg
|
||||
# Create grub menu entries to match the isolinux ones
|
||||
sed -i '/^menuentry/Q' $CDDIR/boot/grub/grub.cfg;
|
||||
# $BASEDIR/tools/boot/$DI_CODENAME/parse_isolinux \
|
||||
# boot$N/isolinux $CDDIR $BASEDIR/data/$DI_CODENAME/grub-theme.in "$DISKINFO_DISTRO" "$DEBIAN_KERNEL" "$DEBVERSION" \
|
||||
# >> $CDDIR/boot/grub/grub.cfg
|
||||
|
||||
# Stuff the EFI boot files into a FAT filesystem, making it as
|
||||
# small as possible. 24KiB headroom seems to be enough;
|
||||
# (x+31)/32*32 rounds up to multiple of 32.
|
||||
# This is the same as in efi-image, but we need to redo it here in
|
||||
# the case of a multi-arch amd64/i386 image
|
||||
# the case of a multi-arch image
|
||||
|
||||
size=0
|
||||
for file in $CDDIR/efi/boot/boot*.efi; do
|
||||
|
|
Loading…
Reference in New Issue