From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1YEQ2L-0001wh-S4 for mharc-grub-devel@gnu.org; Thu, 22 Jan 2015 17:15:38 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45830) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YEQ2J-0001vQ-0G for grub-devel@gnu.org; Thu, 22 Jan 2015 17:15:36 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YEQ2E-0005IK-MA for grub-devel@gnu.org; Thu, 22 Jan 2015 17:15:31 -0500 Received: from mail-wg0-x22f.google.com ([2a00:1450:400c:c00::22f]:63453) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YEQ2E-0005IG-AB for grub-devel@gnu.org; Thu, 22 Jan 2015 17:15:30 -0500 Received: by mail-wg0-f47.google.com with SMTP id n12so4336069wgh.6 for ; Thu, 22 Jan 2015 14:15:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=message-id:date:from:user-agent:mime-version:to:subject:references :in-reply-to:content-type; bh=gVKONMIwSxtOVpCjf1wlPaYCwR2RwGwcJjVT1IEuJlk=; b=DXdC++MqtSMtrATKVCsoDXnbf2k7a5DcDgq1lxv5KbZ3Do0Mn4gou4dcIgq4CViJDt RA8nPysIw2nDuZwA8XtnFMmXitAV0AHfn0pDCcOLPrf3P8e5Ql35O+r46Aqm5PA6iEQs vo+8Vi0PUp7SHj3WP+pfafNajV5ViaoqFzvCb/8Bu5SPjqVXA0ZSeQ2IUU5xmkzzuXFe A8OSL0mmnyLTu5fS60XU8LCTzGH8+f6nnpg6LgSBe3wnznyTkgWjfOd/qjMeG/SFqJJC frkgqI3OcnvGeuBvQG0M7hCtRrhUP7dA30M+MNveQRdklU8e3GP5ydL+HyGjdqzNzRrz 9MMw== X-Received: by 10.194.205.138 with SMTP id lg10mr7660112wjc.130.1421964929791; Thu, 22 Jan 2015 14:15:29 -0800 (PST) Received: from ?IPv6:2a02:1205:501d:9210:c6e9:2fff:fe57:96ed? ([2a02:1205:501d:9210:c6e9:2fff:fe57:96ed]) by mx.google.com with ESMTPSA id d7sm5721964wjs.2.2015.01.22.14.15.28 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 22 Jan 2015 14:15:29 -0800 (PST) Message-ID: <54C17680.9080804@gmail.com> Date: Thu, 22 Jan 2015 23:15:28 +0100 From: =?UTF-8?B?VmxhZGltaXIgJ8+GLWNvZGVyL3BoY29kZXInIFNlcmJpbmVua28=?= User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Icedove/31.3.0 MIME-Version: 1.0 To: The development of GNU GRUB Subject: Re: Does grub-mkrescue support UEFI hybrid USB/DVD images? References: <54C16AD2.7090808@pcbsd.org> In-Reply-To: <54C16AD2.7090808@pcbsd.org> Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="vBtgLUN7MJ6a77G8n54rgc5534TbABw7P" X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:400c:c00::22f 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, 22 Jan 2015 22:15:36 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --vBtgLUN7MJ6a77G8n54rgc5534TbABw7P Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable On 22.01.2015 22:25, Kris Moore wrote: >=20 > Hey all, >=20 > We are trying to create hybrid USB/DVD images, and they work just fine > on BIOS. However it doesn't seem to work when creating UEFI. >=20 Try this: diff --git a/grub-core/disk/efi/efidisk.c b/grub-core/disk/efi/efidisk.c index 3b12c34..983afdb 100644 --- a/grub-core/disk/efi/efidisk.c +++ b/grub-core/disk/efi/efidisk.c @@ -862,9 +862,7 @@ grub_efidisk_get_device_name (grub_efi_handle_t *hand= le) if (! ctx.partition_name) { grub_disk_close (parent); - if (is_cdrom) - return grub_strdup (device_name); - return 0; + return grub_strdup (device_name); } dev_name =3D grub_xasprintf ("%s,%s", parent->name, --vBtgLUN7MJ6a77G8n54rgc5534TbABw7P Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iF4EAREKAAYFAlTBdoAACgkQmBXlbbo5nOuhvQEArYTJ6y/bieNmvZvo8NwJ7fTx vqOo1GGKdRpIqzm3Y94A/3Q04wNsdT4mRDJlkIJKEPUrXT3o05vn0TaTKQ2rM9Pl =GDsS -----END PGP SIGNATURE----- --vBtgLUN7MJ6a77G8n54rgc5534TbABw7P--