From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1W3mOI-0006Ie-0d for mharc-grub-devel@gnu.org; Thu, 16 Jan 2014 07:49:46 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36230) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W3mOE-0006Ev-Un for grub-devel@gnu.org; Thu, 16 Jan 2014 07:49:44 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1W3mOD-00020C-OJ for grub-devel@gnu.org; Thu, 16 Jan 2014 07:49:42 -0500 Received: from v6.chiark.greenend.org.uk ([2001:ba8:1e3::]:46080 helo=chiark.greenend.org.uk) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W3mOD-0001zy-HI for grub-devel@gnu.org; Thu, 16 Jan 2014 07:49:41 -0500 Received: from [172.20.153.9] (helo=riva.pelham.vpn.ucam.org) by chiark.greenend.org.uk (Debian Exim 4.72 #1) with esmtps (return-path cjwatson@ubuntu.com) id 1W3mOB-0003oD-TQ for grub-devel@gnu.org; Thu, 16 Jan 2014 12:49:40 +0000 Received: from ns1.pelham.vpn.ucam.org ([172.20.153.2] helo=riva.ucam.org) by riva.pelham.vpn.ucam.org with esmtps (TLS1.2:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.80) (envelope-from ) id 1W3mOB-00070E-06 for grub-devel@gnu.org; Thu, 16 Jan 2014 12:49:39 +0000 Date: Thu, 16 Jan 2014 12:49:37 +0000 From: Colin Watson To: grub-devel@gnu.org Subject: [PATCH] grub-shell: Pass -no-pad to xorriso when building floppy images Message-ID: <20140116124937.GP5883@riva.ucam.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2001:ba8:1e3:: X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: The development of GNU GRUB List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 Jan 2014 12:49:44 -0000 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 + + * tests/util/grub-shell.in: Pass -no-pad to xorriso when building + floppy images, saving about 300KiB. + 2014-01-08 Colin Watson * 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