aboutsummaryrefslogtreecommitdiffstats
path: root/tools/pygrub
diff options
context:
space:
mode:
authorMarcel J.E. Mol <marcel@mesa.nl>2013-06-24 18:21:32 +0200
committerIan Campbell <ian.campbell@citrix.com>2013-06-27 12:07:02 +0100
commitd513814db6af2b298b8776d7ffc5fb1261e176f4 (patch)
tree8fccad1120195f38be0a4859ccf4c5d759eae369 /tools/pygrub
parent543a2657182dbb9237d1feeb1d3193096ab2cb2d (diff)
downloadxen-d513814db6af2b298b8776d7ffc5fb1261e176f4.tar.gz
xen-d513814db6af2b298b8776d7ffc5fb1261e176f4.tar.bz2
xen-d513814db6af2b298b8776d7ffc5fb1261e176f4.zip
pygrub/GrubConf: fix boot problem for fedora 19 grub.cfg (2nd attempt)
Booting a fedora 19 domU failed because a it could not properly parse the grub.cfg file. This was cased by set default="${next_entry}" This statement actually is within an 'if' statement, so maybe it would be better to skip code within if/fi blocks... But this patch seems to work fine. Signed-off-by: Marcel Mol <marcel@mesa.nl> Acked-by: Ian Campbell <ian.campbell@citix.com> Tested-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Diffstat (limited to 'tools/pygrub')
-rw-r--r--tools/pygrub/src/GrubConf.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/pygrub/src/GrubConf.py b/tools/pygrub/src/GrubConf.py
index 629951f941..6324c625fe 100644
--- a/tools/pygrub/src/GrubConf.py
+++ b/tools/pygrub/src/GrubConf.py
@@ -427,6 +427,8 @@ class Grub2ConfigFile(_GrubConfigFile):
if self.commands[com] is not None:
if arg.strip() == "${saved_entry}":
arg = "0"
+ elif arg.strip() == "${next_entry}":
+ arg = "0"
setattr(self, self.commands[com], arg.strip())
else:
logging.info("Ignored directive %s" %(com,))