- don't look for kernel sy s if hypervisor is not built

[packages/xen.git] / pygrubfix.patch

diff --git a/pygrubfix.patch b/pygrubfix.patch
index e0393698a01c5a2caf708ac0f2a8f915688d2e0c..4df88c173f6be7e61984eb2855f5fee2e45810c6 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 -dur xen-4.2.0.orig/tools/pygrub/src/pygrub xen-4.2.0/tools/pygrub/src/pygrub
+--- xen-4.2.0.orig/tools/pygrub/src/pygrub     2012-09-17 12:21:18.000000000 +0200
++++ xen-4.2.0/tools/pygrub/src/pygrub  2012-10-22 10:57:09.000000000 +0200
+@@ -119,6 +119,7 @@
      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 @@
+@@ -128,6 +129,7 @@
          
          # offset == 0 implies this partition is not enabled
          if offset == 0:
@@ -16,7 +17,7 @@
              continue
  
          if type == FDISK_PART_SOLARIS or type == FDISK_PART_SOLARIS_OLD:
-@@ -123,6 +125,9 @@
+@@ -148,6 +150,9 @@
          else:
              part_offs.append(offset)