From 757907af26fda8df608b58cbb3fede8eb03434c0 Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Thu, 15 Apr 2010 17:36:55 +0100 Subject: pygrub: Fix Grub2 support for Ubuntu 10.04 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. Signed-off-by: David Markey --- tools/pygrub/src/GrubConf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tools/pygrub') diff --git a/tools/pygrub/src/GrubConf.py b/tools/pygrub/src/GrubConf.py index c03f374156..51d0c17a4e 100644 --- a/tools/pygrub/src/GrubConf.py +++ b/tools/pygrub/src/GrubConf.py @@ -379,7 +379,7 @@ class Grub2ConfigFile(_GrubConfigFile): 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) -- cgit v1.2.3