From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1KBukP-0006Cq-HD for mharc-grub-devel@gnu.org; Thu, 26 Jun 2008 12:55:01 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1KBukN-0006C0-HY for grub-devel@gnu.org; Thu, 26 Jun 2008 12:54:59 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1KBukL-00069v-KV for grub-devel@gnu.org; Thu, 26 Jun 2008 12:54:58 -0400 Received: from [199.232.76.173] (port=35521 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1KBukL-00069p-F5 for grub-devel@gnu.org; Thu, 26 Jun 2008 12:54:57 -0400 Received: from c60.cesmail.net ([216.154.195.49]:25807) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_ARCFOUR_SHA1:16) (Exim 4.60) (envelope-from ) id 1KBukL-0006FE-2t for grub-devel@gnu.org; Thu, 26 Jun 2008 12:54:57 -0400 Received: from unknown (HELO relay.cesmail.net) ([192.168.1.81]) by c60.cesmail.net with ESMTP; 26 Jun 2008 12:54:56 -0400 Received: from [192.168.0.21] (static-72-92-88-10.phlapa.fios.verizon.net [72.92.88.10]) by relay.cesmail.net (Postfix) with ESMTP id 6F953618F22 for ; Thu, 26 Jun 2008 12:54:55 -0400 (EDT) From: Pavel Roskin To: The development of GRUB 2 In-Reply-To: <1214491693.30044.5.camel@dv> References: <1214430514.11716.19.camel@dv> <20080626142010.GD7511@thorin> <1214491693.30044.5.camel@dv> Content-Type: text/plain Date: Thu, 26 Jun 2008 12:54:54 -0400 Message-Id: <1214499294.17243.2.camel@dv> Mime-Version: 1.0 X-Mailer: Evolution 2.22.2 (2.22.2-2.fc9) Content-Transfer-Encoding: 7bit X-detected-kernel: by monty-python.gnu.org: Genre and OS details not recognized. Subject: Re: Failure to embed core.img is fatal now 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, 26 Jun 2008 16:54:59 -0000 On Thu, 2008-06-26 at 10:48 -0400, Pavel Roskin wrote: > Anyway, I think there is a much simpler approach. Changes to the memory > image of core.img should be applied after the image is tested for > readability. Until then, they should be in temporary variables. Here's the patch. It's an alternative to writing the second sector first. Now GRUB would modify core_img immediately before writing it. diff --git a/util/i386/pc/grub-setup.c b/util/i386/pc/grub-setup.c index 62c1bf1..3e9b4b5 100644 --- a/util/i386/pc/grub-setup.c +++ b/util/i386/pc/grub-setup.c @@ -101,6 +101,7 @@ setup (const char *dir, grub_uint16_t *boot_drive_check; struct boot_blocklist *first_block, *block; grub_int32_t *install_dos_part, *install_bsd_part; + grub_int32_t dos_part, bsd_part; char *tmp_img; int i; grub_disk_addr_t first_sector; @@ -283,27 +284,24 @@ setup (const char *dir, { struct grub_pc_partition *pcdata = root_dev->disk->partition->data; - *install_dos_part - = grub_cpu_to_le32 (pcdata->dos_part); - *install_bsd_part - = grub_cpu_to_le32 (pcdata->bsd_part); + dos_part = grub_cpu_to_le32 (pcdata->dos_part); + bsd_part = grub_cpu_to_le32 (pcdata->bsd_part); } else if (strcmp (root_dev->disk->partition->partmap->name, "gpt_partition_map") == 0) { - *install_dos_part = grub_cpu_to_le32 (root_dev->disk->partition->index); - *install_bsd_part = grub_cpu_to_le32 (-1); + dos_part = grub_cpu_to_le32 (root_dev->disk->partition->index); + bsd_part = grub_cpu_to_le32 (-1); } else grub_util_error ("No PC style partitions found"); } else - *install_dos_part = *install_bsd_part = grub_cpu_to_le32 (-1); + dos_part = bsd_part = grub_cpu_to_le32 (-1); } grub_util_info ("dos partition is %d, bsd partition is %d", - grub_le_to_cpu32 (*install_dos_part), - grub_le_to_cpu32 (*install_bsd_part)); + grub_le_to_cpu32 (dos_part), grub_le_to_cpu32 (bsd_part)); /* If the destination device can have partitions and it is the MBR, try to embed the core image into after the MBR. */ @@ -316,6 +314,9 @@ setup (const char *dir, { grub_util_info ("will embed the core image at sector 0x%llx", embed_region.start); + *install_dos_part = dos_part; + *install_bsd_part = bsd_part; + /* The first blocklist contains the whole sectors. */ first_block->start = grub_cpu_to_le64 (embed_region.start + 1); first_block->len = grub_cpu_to_le16 (core_sectors - 1); @@ -485,6 +486,9 @@ setup (const char *dir, the boot device. */ *root_drive = 0xFF; + *install_dos_part = dos_part; + *install_bsd_part = bsd_part; + /* Write the first two sectors of the core image onto the disk. */ grub_util_info ("opening the core image `%s'", core_path); fp = fopen (core_path, "r+b"); -- Regards, Pavel Roskin