grub-shell: Pass -no-pad to xorriso when building floppy images

The floppy images built by grub-shell are currently just over the
floppy limit, and the Debian patch set plus the 915resolution extra
bring this up to the point where GRUB tries to actually read past
the floppy limit, breaking fddboot_test.  Passing -no-pad buys us
300KiB, which should keep us going for a while.

* tests/util/grub-shell.in: Pass -no-pad to xorriso when building
floppy images, saving 300KiB.

Forwarded: https://lists.gnu.org/archive/html/grub-devel/2014-01/msg00074.html
Last-Update: 2014-01-16

Patch-Name: grub-shell-no-pad.patch

diff --git a/tests/util/grub-shell.in b/tests/util/grub-shell.in
index d9a5253e26fc939441a9ede637977a3a19fb1da2..6f135914fcbdc2f2fb1e361fe408029e186664b4 100644 (file)
--- a/tests/util/grub-shell.in
+++ b/tests/util/grub-shell.in
@@ -346,6 +346,10 @@ if test -z "$debug"; then
   qemuopts="${qemuopts} -nographic -monitor file:/dev/null"
 fi
 
+if [ x$boot = xfd ]; then
+    mkrescue_args="${mkrescue_args} -- -no-pad"
+fi
+
 if [ x$boot != xnet ] && [ x$boot != xemu ]; then
     pkgdatadir="@builddir@" "@builddir@/grub-mkrescue" "--output=${isofile}" "--override-directory=${builddir}/grub-core" \
        --rom-directory="${rom_directory}" \