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.
---
ChangeLog | 5 +++++
tests/util/grub-shell.in | 4 ++++
2 files changed, 9 insertions(+)
diff --git a/ChangeLog b/ChangeLog
index b445f12..c0cc45e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-01-16 Colin Watson <cjwat...@ubuntu.com>
+
+ * tests/util/grub-shell.in: Pass -no-pad to xorriso when building
+ floppy images, saving about 300KiB.
+
2014-01-08 Colin Watson <cjwat...@ubuntu.com>
* Makefile.util.def (grub-macbless): Change mansection to 8.
diff --git a/tests/util/grub-shell.in b/tests/util/grub-shell.in
index d9a5253..6f13591 100644
--- 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}" \
--
1.8.5.2
_______________________________________________
Grub-devel mailing list
Grub-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/grub-devel
