[Xen-changelog] [xen stable-4.2] pygrub/GrubConf: fix boot problem for fedora 19 grub.cfg (2nd attempt)

[patchbot@xxxxxxx]

commit b39ea9914cb9c4cc5ecc6fe10cc05a4d08855a2e
Author:     Marcel J.E. Mol <marcel@xxxxxxx>
AuthorDate: Mon Jun 24 18:21:32 2013 +0200
Commit:     Ian Jackson <Ian.Jackson@xxxxxxxxxxxxx>
CommitDate: Wed Jul 17 11:58:05 2013 +0100

    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@xxxxxxx>
    Acked-by: Ian Campbell <ian.campbell@xxxxxxxxx>
    Tested-by: Konrad Rzeszutek Wilk <konrad.wilk@xxxxxxxxxx>
    (cherry picked from commit d513814db6af2b298b8776d7ffc5fb1261e176f4)
---
 tools/pygrub/src/GrubConf.py |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/tools/pygrub/src/GrubConf.py b/tools/pygrub/src/GrubConf.py
index c4f543d..237d4d7 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,))
--
generated by git-patchbot for /home/xen/git/xen.git#stable-4.2

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog