From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1KEXtW-0007dg-1y for mharc-grub-devel@gnu.org; Thu, 03 Jul 2008 19:07:18 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1KEXtT-0007bw-46 for grub-devel@gnu.org; Thu, 03 Jul 2008 19:07:15 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1KEXtR-0007bD-2P for grub-devel@gnu.org; Thu, 03 Jul 2008 19:07:14 -0400 Received: from [199.232.76.173] (port=56385 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1KEXtQ-0007aw-Rd for grub-devel@gnu.org; Thu, 03 Jul 2008 19:07:12 -0400 Received: from aybabtu.com ([69.60.117.155]:34246) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1KEXtQ-0003Sh-DX for grub-devel@gnu.org; Thu, 03 Jul 2008 19:07:12 -0400 Received: from [192.168.10.10] (helo=thorin) by aybabtu.com with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.69) (envelope-from ) id 1KEXpT-0007Ue-9u for grub-devel@gnu.org; Fri, 04 Jul 2008 01:03:07 +0200 Received: from rmh by thorin with local (Exim 4.63) (envelope-from ) id 1KEXsf-0007Ce-TZ for grub-devel@gnu.org; Fri, 04 Jul 2008 01:06:25 +0200 Date: Fri, 4 Jul 2008 01:06:25 +0200 From: Robert Millan To: The development of GRUB 2 Message-ID: <20080703230625.GD4074@thorin> References: <20080606162339.GA14162@thorin> <87prpu4wkt.fsf@xs4all.nl> <20080703225021.GA4074@thorin> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="VbJkn9YxBvnuCH5J" Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20080703225021.GA4074@thorin> Organization: free as in freedom X-Message-Flag: Worried about Outlook viruses? Switch to Thunderbird! www.mozilla.com/thunderbird X-Debbugs-No-Ack: true User-Agent: Mutt/1.5.13 (2006-08-11) X-detected-kernel: by monty-python.gnu.org: Genre and OS details not recognized. Subject: Re: [PATCH] disk/fs_uuid.c X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: The development of GRUB 2 List-Id: The development of GRUB 2 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Jul 2008 23:07:15 -0000 --VbJkn9YxBvnuCH5J Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit On Fri, Jul 04, 2008 at 12:50:21AM +0200, Robert Millan wrote: > > I _did_ extend the search command (before this patch). The reason for > providing this is basicaly that it makes grub.cfg more readable (and easier > to understand), and can't be used outside the context of scripting (for > example, to set your root/prefix to it, but that would require a patch I > intend to put together soon). Basicaly like this; but it'd have to check that UUID is needed rather than using it unconditionaly, of course. -- Robert Millan I know my rights; I want my phone call! What good is a phone call… if you are unable to speak? (as seen on /.) --VbJkn9YxBvnuCH5J Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="uuid_boot.diff" Index: include/grub/i386/pc/kernel.h =================================================================== --- include/grub/i386/pc/kernel.h (revision 1686) +++ include/grub/i386/pc/kernel.h (working copy) @@ -41,7 +41,7 @@ #define GRUB_KERNEL_MACHINE_PREFIX 0x20 /* End of the data section. */ -#define GRUB_KERNEL_MACHINE_DATA_END 0x50 +#define GRUB_KERNEL_MACHINE_DATA_END 0x60 /* The size of the first region which won't be compressed. */ #define GRUB_KERNEL_MACHINE_RAW_SIZE (GRUB_KERNEL_MACHINE_DATA_END + 0x450) Index: util/i386/pc/grub-install.in =================================================================== --- util/i386/pc/grub-install.in (revision 1686) +++ util/i386/pc/grub-install.in (working copy) @@ -232,13 +232,13 @@ devabstraction_module=`$grub_probe --target=abstraction --device ${grub_device}` if [ "x${devabstraction_module}" = "x" ] ; then - prefix_drive= + prefix_drive=\(UUID=`$grub_probe --target=fs_uuid --device ${grub_device}`\) else prefix_drive=`$grub_probe --target=drive --device ${grub_device}` fi # The order in this list is critical. Be careful when modifiing it. -modules="$modules $fs_module $partmap_module biosdisk $devabstraction_module" +modules="$modules $fs_module $partmap_module biosdisk $devabstraction_module fs_uuid" $grub_mkimage --output=${grubdir}/core.img \ --prefix=${prefix_drive}`make_system_path_relative_to_its_root ${grubdir}`/ \ --VbJkn9YxBvnuCH5J--