[xen] more pygrub improvements for grub2 on guest

[myoung]

commit d0a8fa66e1a11e84ed2dd4b1e971e28a88e34912
Author: Michael Young <m.a.young at durham.ac.uk>
Date:   Fri Oct 14 21:39:11 2011 +0100

    more pygrub improvements for grub2 on guest

 pygrubfix2.patch |   14 ++++++++++++--
 xen.spec         |    5 ++++-
 2 files changed, 16 insertions(+), 3 deletions(-)
---
diff --git a/pygrubfix2.patch b/pygrubfix2.patch
index 8bd40c7..7f308c6 100644
--- a/pygrubfix2.patch
+++ b/pygrubfix2.patch
@@ -42,7 +42,7 @@
                             ["/boot/isolinux/isolinux.cfg",
                              "/boot/extlinux.conf"])
 --- xen-4.1.2/tools/pygrub/src/GrubConf.py.orig	2011-10-08 19:42:10.000000000 +0100
-+++ xen-4.1.2/tools/pygrub/src/GrubConf.py	2011-10-13 20:53:13.000000000 +0100
++++ xen-4.1.2/tools/pygrub/src/GrubConf.py	2011-10-14 21:08:44.000000000 +0100
 @@ -79,6 +79,8 @@
          val = val.replace("(", "").replace(")", "")
          if val[:5] == "msdos":
@@ -60,7 +60,7 @@
          for l in lines:
              l = l.strip()
              # skip blank lines
-@@ -394,10 +397,17 @@
+@@ -394,10 +397,18 @@
                  img = []
                  title = title_match.group(1)
                  continue
@@ -68,6 +68,7 @@
 +
 +            if l.startswith("submenu"):
 +                menu_level += 1
++                continue
 +
              if l.startswith("}"):
                  if img is None:
@@ -80,3 +81,12 @@
  
                  self.add_image(Grub2Image(title, img))
                  img = None
+@@ -414,6 +425,8 @@
+                 
+             if self.commands.has_key(com):
+                 if self.commands[com] is not None:
++                    if arg.strip() == "${saved_entry}":
++                        arg = "0"
+                     setattr(self, self.commands[com], arg.strip())
+                 else:
+                     logging.info("Ignored directive %s" %(com,))
diff --git a/xen.spec b/xen.spec
index 1cd2666..b256a17 100644
--- a/xen.spec
+++ b/xen.spec
@@ -6,7 +6,7 @@
 Summary: Xen is a virtual machine monitor
 Name:    xen
 Version: 4.1.1
-Release: 7%{?dist}
+Release: 8%{?dist}
 Group:   Development/Libraries
 License: GPLv2+ and LGPLv2+ and BSD
 URL:     http://xen.org/
@@ -564,6 +564,9 @@ rm -rf %{buildroot}
 %doc licensedir/*
 
 %changelog
+* Fri Oct 14 2011 Michael Young <m.a.young at durham.ac.uk> - 4.1.1-8
+- more pygrub improvements for grub2 on guest
+
 * Thu Oct 13 2011 Michael Young <m.a.young at durham.ac.uk> - 4.1.1-7
 - make pygrub work better with GPT partitions and grub2 on guest