From: "Grégoire Sutre" <gregoire.sutre@gmail.com>
To: The development of GNU GRUB <grub-devel@gnu.org>
Subject: [Patch] Use absolute offset for embedding area in grub-setup (i386-pc)
Date: Sat, 05 Jun 2010 02:22:04 +0200 [thread overview]
Message-ID: <4C0998AC.5010405@gmail.com> (raw)
[-- Attachment #1: Type: text/plain, Size: 573 bytes --]
Hi,
The attached patch uses grub_partition_get_start (p) instead of p->start
in grub-setup's iteration over partitions. While we are at it, also
use grub_partition_get_len (p) instead of p->len.
An alternative would be to assume that partitions are properly nested,
and therefore iterate only over the top-level ones (i.e. those with
p->parent == NULL). In that case, we could equivalently use p->start.
In the check for non-empty embedding area, the patch uses <= instead of
== (as we may have embed_region.start == 1 && embed_region.end == 0).
Comments?
Grégoire
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: grub-setup.diff --]
[-- Type: text/x-patch; name="grub-setup.diff", Size: 1781 bytes --]
=== modified file 'ChangeLog'
--- ChangeLog 2010-06-03 08:48:23 +0000
+++ ChangeLog 2010-06-05 00:14:38 +0000
@@ -1,3 +1,8 @@
+2010-06-05 Grégoire Sutre <gregoire.sutre@gmail.com>
+
+ * util/i386/pc/grub-setup.c (setup): Use absolute offsets for start of
+ embedding area. Use <= instead of == when checking for non-emptyness.
+
2010-06-03 Colin Watson <cjwatson@ubuntu.com>
* INSTALL: Document several build requirements for optional features
=== modified file 'util/i386/pc/grub-setup.c'
--- util/i386/pc/grub-setup.c 2010-05-17 19:26:16 +0000
+++ util/i386/pc/grub-setup.c 2010-06-04 23:53:08 +0000
@@ -126,8 +126,8 @@ setup (const char *dir,
/* There's always an embed region, and it starts right after the MBR. */
embed_region.start = 1;
- if (embed_region.end > p->start)
- embed_region.end = p->start;
+ if (embed_region.end > grub_partition_get_start (p))
+ embed_region.end = grub_partition_get_start (p);
return 0;
}
@@ -147,8 +147,8 @@ setup (const char *dir,
/* If there's an embed region, it is in a dedicated partition. */
if (! memcmp (&gptdata.type, &grub_gpt_partition_type_bios_boot, 16))
{
- embed_region.start = p->start;
- embed_region.end = p->start + p->len;
+ embed_region.start = grub_partition_get_start (p);
+ embed_region.end = grub_partition_get_start (p) + grub_partition_get_len (p);
return 1;
}
@@ -361,7 +361,7 @@ setup (const char *dir,
else
grub_util_error (_("No DOS-style partitions found"));
- if (embed_region.end == embed_region.start)
+ if (embed_region.end <= embed_region.start)
{
if (! strcmp (dest_partmap, "msdos"))
grub_util_warn (_("This msdos-style partition label has no post-MBR gap; embedding won't be possible!"));
next reply other threads:[~2010-06-05 0:22 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-06-05 0:22 Grégoire Sutre [this message]
2010-06-07 20:48 ` [Patch] Use absolute offset for embedding area in grub-setup (i386-pc) Vladimir 'φ-coder/phcoder' Serbinenko
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4C0998AC.5010405@gmail.com \
--to=gregoire.sutre@gmail.com \
--cc=grub-devel@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox