File grub2-iterate-and-hook-for-extended.patch of Package grub2

Overview Repositories Revisions Requests Users Attributes Meta

File grub2-iterate-and-hook-for-extended.patch of Package grub2

From: Michael Chang <mchang@suse.com>
Date: Tue, 2 Jun 2020 17:33:37 +0800
Subject: [PATCH] grub2-iterate-and-hook-for-extended-partition

The same as in the previous patch, add a support for installing grub
into an extended partition.

Here, we do not ignore extended partitions anymore. Instead we call a
hook that makes sure we have the partition when installing.

Signed-off-by: Jiri Slaby <jslaby@suse.cz>
References: https://bugzilla.novell.com/show_bug.cgi?id=750897

From: Andrey Borzenkov <arvidjaar@gmail.com>

Apply this logic only to primary extended partition. Ignore extended
partitions that are used to link together logical partitions.

References: https://bugzilla.novell.com/show_bug.cgi?id=785341
---
 grub-core/partmap/msdos.c | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/grub-core/partmap/msdos.c b/grub-core/partmap/msdos.c
index 58c3626c6..e180b51aa 100644
--- a/grub-core/partmap/msdos.c
+++ b/grub-core/partmap/msdos.c
@@ -188,13 +188,20 @@ grub_partition_msdos_iterate (grub_disk_t disk,
 			(unsigned long long) p.len);
 
 	  /* If this partition is a normal one, call the hook.  */
-	  if (! grub_msdos_partition_is_empty (e->type)
-	      && ! grub_msdos_partition_is_extended (e->type))
+	  if (! grub_msdos_partition_is_empty (e->type))
 	    {
-	      p.number++;
-
-	      if (hook (disk, &p, hook_data))
-		return grub_errno;
+	      if (!grub_msdos_partition_is_extended (e->type) || p.number < 3)
+		{
+		  p.number++;
+
+		  /* prevent someone doing mkfs or mkswap on an
+		  extended partition, but leave room for LILO */
+		  if (grub_msdos_partition_is_extended (e->type))
+		    p.len = 2;
+
+		  if (hook (disk, &p, hook_data))
+		    return grub_errno;
+		}
 	    }
 	  else if (p.number < 3)
 	    /* If this partition is a logical one, shouldn't increase the

Places

File grub2-iterate-and-hook-for-extended.patch of Package grub2

Places