[Xen-devel] [PATCH] pygrub: Fix Grub2 support for Ubuntu 10.04

[David Markey <admin@xxxxxxxxxxx>]

Due to changes in grub2, menu entry titles now have single quote around them rather than double quotes, but the memtest entries still are using double quotes, so we need to catch both.

  

This is against 4.0

Signed-off-by: David Markey <david.markey@xxxxxxxxxx>

--- 1/tools/pygrub/src/GrubConf.py  2010-04-15 15:38:54.000000000 +0100

+++ 2/tools/pygrub/src/GrubConf.py  2010-04-15 15:38:34.000000000 +0100

@@ -379,7 +379,7 @@

                 continue

             # new image

-            title_match = re.match('^menuentry "(.*)" (.*){', l)

+            title_match = re.match('^menuentry ["\'](.*)["\'] (.*){', l)

             if title_match:

                 if img is not None:

                     raise RuntimeError, "syntax error: cannot nest menuentry (%d %s)" % (len(img),img)

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel