* The "default" value can be a quoted string (containing an integer)
so strip the quotes before interpreting.
* The "set" command takes a variable with an arbitrary name so instead
of whitelisting the ones to ignore simply silently accept any set
command with an unknown variable.
* Ignore the echo command.
* Handle the function { ... } syntax. Previously pygrub would error
out with a syntax error on the closing "}" because it thought it was
the closing bracket of a menuentry.
This makes pygrub2 work with the configuration files generated by
Debian Squeeze today.
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
diff -r 0629d3df8023 -r 447ced826dce tools/pygrub/src/GrubConf.py
--- a/tools/pygrub/src/GrubConf.py Tue Jan 26 15:06:17 2010 +0000
+++ b/tools/pygrub/src/GrubConf.py Tue Jan 26 15:16:40 2010 +0000
@@ -219,6 +219,7 @@
def _get_default(self):
return self._default
def _set_default(self, val):
+ val = val.strip("\"")
if val == "saved":
self._default = 0
else:
@@ -315,6 +316,8 @@
setattr(self, self.commands[com], arg.strip())
else:
logging.info("Ignored image directive %s" %(com,))
+ elif com.startswith(''set:''):
+ pass
else:
logging.warning("Unknown image directive %s" %(com,))
@@ -328,6 +331,7 @@
commands = {''set:root'': ''root'',
''linux'': ''kernel'',
''initrd'': ''initrd'',
+ ''echo'': None,
''insmod'': None,
''search'': None}
@@ -346,6 +350,7 @@
else:
lines = buf.split("\n")
+ in_function = False
img = None
title = ""
for l in lines:
@@ -356,6 +361,16 @@
# skip comments
if l.startswith(''#''):
continue
+
+ # skip function declarations
+ if l.startswith(''function''):
+ in_function = True
+ continue
+ if in_function:
+ if l.startswith(''}''):
+ in_function = False
+ continue
+
# new image
title_match = re.match(''^menuentry "(.*)"
{'', l)
if title_match:
@@ -388,6 +403,8 @@
setattr(self, self.commands[com], arg.strip())
else:
logging.info("Ignored directive %s" %(com,))
+ elif com.startswith(''set:''):
+ pass
else:
logging.warning("Unknown directive %s" %(com,))
@@ -400,11 +417,10 @@
commands = {''set:default'': ''default'',
''set:root'': ''root'',
''set:timeout'': ''timeout'',
- ''set:gfxmode'': None,
- ''set:menu_color_normal'': None,
- ''set:menu_color_highlight'': None,
''terminal'': None,
''insmod'': None,
+ ''load_env'': None,
+ ''save_env'': None,
''search'': None,
''if'': None,
''fi'': None,
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel