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

Add workaround for dosfstools issue (#823881)

This commit is contained in:
Steve McIntyre 2016-05-10 01:26:05 +01:00
parent cc4732add9
commit b41ebd8607
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
debian/changelog vendored
View File

@ -2,6 +2,7 @@ debian-cd (3.1.19) UNRELEASED; urgency=medium
[ Steve McIntyre ] [ Steve McIntyre ]
* Also fix size calculation for EFI image for arm64 * Also fix size calculation for EFI image for arm64
* Add workaround for dosfstools issue (#823881)
-- Steve McIntyre <93sam@debian.org> Fri, 06 May 2016 22:59:32 +0100 -- Steve McIntyre <93sam@debian.org> Fri, 06 May 2016 22:59:32 +0100

7
tools/boot/stretch/boot-arm64
View File

@ -127,12 +127,13 @@ if [ -d boot$N/grub ] ; then
block_bytes=1024 block_bytes=1024
blocks=$(($tracks * $track_bytes / $block_bytes)) blocks=$(($tracks * $track_bytes / $block_bytes))
rm -f $CDDIR/boot/grub/efi.img # Workaround for #823881:
mkfs.msdos -C "$CDDIR/boot/grub/efi.img" $blocks >/dev/null export MTOOLS_SKIP_CHECK=1
mmd -i "$CDDIR/boot/grub/efi.img" ::efi mmd -i "$CDDIR/boot/grub/efi.img" ::efi
mmd -i "$CDDIR/boot/grub/efi.img" ::efi/boot mmd -i "$CDDIR/boot/grub/efi.img" ::efi/boot
mcopy -i "$CDDIR/boot/grub/efi.img" $CDDIR/efi/boot/boot*.efi \ mcopy -o -i "$CDDIR/boot/grub/efi.img" $CDDIR/efi/boot/boot*.efi \
"::efi/boot" "::efi/boot"
unset MTOOLS_SKIP_CHECK
# Ugh - different code here depending on the version of xorriso we've got # Ugh - different code here depending on the version of xorriso we've got
if [ $XORRISO_VER -le 10202 ] ; then if [ $XORRISO_VER -le 10202 ] ; then

5
tools/boot/stretch/boot-x86
View File

@ -515,11 +515,14 @@ if [ -d boot$N/isolinux/grub ] && [ $BOOT_EFI -ne 0 ] ; then
blocks=$(($tracks * $track_bytes / $block_bytes)) blocks=$(($tracks * $track_bytes / $block_bytes))
rm -f $CDDIR/boot/grub/efi.img rm -f $CDDIR/boot/grub/efi.img
mkfs.msdos -C "$CDDIR/boot/grub/efi.img" $blocks >/dev/null mkfs.msdos -v -C "$CDDIR/boot/grub/efi.img" $blocks >/dev/null
# Workaround for #823881:
export MTOOLS_SKIP_CHECK=1
mmd -i "$CDDIR/boot/grub/efi.img" ::efi mmd -i "$CDDIR/boot/grub/efi.img" ::efi
mmd -i "$CDDIR/boot/grub/efi.img" ::efi/boot mmd -i "$CDDIR/boot/grub/efi.img" ::efi/boot
mcopy -o -i "$CDDIR/boot/grub/efi.img" $CDDIR/efi/boot/boot*.efi \ mcopy -o -i "$CDDIR/boot/grub/efi.img" $CDDIR/efi/boot/boot*.efi \
"::efi/boot" "::efi/boot"
unset MTOOLS_SKIP_CHECK
if [ $BOOT_EFI = 2 ] ; then if [ $BOOT_EFI = 2 ] ; then
# We're being added alongside (after) a BIOS boot record. Tell # We're being added alongside (after) a BIOS boot record. Tell