- updated to 4.18.1; new sonames, ocaml libxenlight and libxentoollog are gone

[packages/xen.git] / pygrubfix.patch

--- xen-4.18.1/tools/pygrub/src/pygrub.orig	2024-03-18 09:27:49.000000000 +0100
+++ xen-4.18.1/tools/pygrub/src/pygrub	2024-04-22 20:02:33.313097814 +0200
@@ -256,6 +256,7 @@ def get_partition_offsets(file):
     fd = os.open(file, os.O_RDONLY)
     buf = os.read(fd, 512)
     os.close(fd)
+    offzerocount = 0
     for poff in (446, 462, 478, 494): # partition offsets
 
         # MBR contains a 16 byte descriptor per partition
@@ -265,6 +266,7 @@ def get_partition_offsets(file):
 
         # offset == 0 implies this partition is not enabled
         if offset == 0:
+            offzerocount += 1
             continue
 
         if type == FDISK_PART_SOLARIS or type == FDISK_PART_SOLARIS_OLD:
@@ -290,6 +292,9 @@ def get_partition_offsets(file):
     # (e.g. grubs) may contain the same signature.
     if not part_offs: part_offs = [0]
 
+    if offzerocount == 4:
+        # Might be a grub boot sector pretending to be an MBR
+        part_offs.append(0)
     return part_offs
 
 class GrubLineEditor(curses.textpad.Textbox):