]> git.proxmox.com Git - grub2.git/blob - debian/patches/grub-shell-no-pad.patch
New upstream beta release (2.02~beta3).
[grub2.git] / debian / patches / grub-shell-no-pad.patch
1 From d36baf78117f7bb817b05cc0b66a5434a5bb5c6c Mon Sep 17 00:00:00 2001
2 From: Colin Watson <cjwatson@debian.org>
3 Date: Thu, 16 Jan 2014 12:51:23 +0000
4 Subject: grub-shell: Pass -no-pad to xorriso when building floppy images
5
6 The floppy images built by grub-shell are currently just over the
7 floppy limit, and the Debian patch set plus the 915resolution extra
8 bring this up to the point where GRUB tries to actually read past
9 the floppy limit, breaking fddboot_test. Passing -no-pad buys us
10 300KiB, which should keep us going for a while.
11
12 * tests/util/grub-shell.in: Pass -no-pad to xorriso when building
13 floppy images, saving 300KiB.
14
15 Forwarded: https://lists.gnu.org/archive/html/grub-devel/2014-01/msg00074.html
16 Last-Update: 2014-01-16
17
18 Patch-Name: grub-shell-no-pad.patch
19 ---
20 tests/util/grub-shell.in | 4 ++++
21 1 file changed, 4 insertions(+)
22
23 diff --git a/tests/util/grub-shell.in b/tests/util/grub-shell.in
24 index ab19dbb..6e4cb90 100644
25 --- a/tests/util/grub-shell.in
26 +++ b/tests/util/grub-shell.in
27 @@ -371,6 +371,10 @@ if test -z "$debug"; then
28 qemuopts="${qemuopts} -nographic -monitor file:/dev/null"
29 fi
30
31 +if [ x$boot = xfd ]; then
32 + mkrescue_args="${mkrescue_args} -- -no-pad"
33 +fi
34 +
35 if [ x$boot != xnet ] && [ x$boot != xemu ]; then
36 pkgdatadir="@builddir@" "@builddir@/grub-mkrescue" "--output=${isofile}" "--override-directory=${builddir}/grub-core" \
37 --rom-directory="${rom_directory}" \