- updated to 4.16.5

[packages/xen.git] / pygrubfix.patch

diff --git a/pygrubfix.patch b/pygrubfix.patch
index e0393698a01c5a2caf708ac0f2a8f915688d2e0c..6ff2025aaa393da30bb2c61e948281f1699eb190 100644 (file)
--- a/pygrubfix.patch
+++ b/pygrubfix.patch
@@ -1,14 +1,15 @@
---- xen-4.1.0/tools/pygrub/src/pygrub.orig     2010-12-31 15:24:11.000000000 +0000
-+++ xen-4.1.0/tools/pygrub/src/pygrub  2011-01-30 18:58:17.000000000 +0000
-@@ -96,6 +96,7 @@
- 
+diff -urNp -x '*.orig' xen-4.13.1.org/tools/pygrub/src/pygrub xen-4.13.1/tools/pygrub/src/pygrub
+--- xen-4.13.1.org/tools/pygrub/src/pygrub     2021-03-25 22:42:14.797689878 +0100
++++ xen-4.13.1/tools/pygrub/src/pygrub 2021-03-25 22:42:15.517685792 +0100
+@@ -129,6 +129,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
-@@ -105,6 +106,7 @@
+@@ -138,6 +139,7 @@ def get_partition_offsets(file):
          
          # offset == 0 implies this partition is not enabled
          if offset == 0:
@@ -16,9 +17,9 @@
              continue
  
          if type == FDISK_PART_SOLARIS or type == FDISK_PART_SOLARIS_OLD:
-@@ -123,6 +125,9 @@
-         else:
-             part_offs.append(offset)
+@@ -163,6 +165,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