diff options
| author | Marcel J.E. Mol <marcel@mesa.nl> | 2013-06-24 18:21:32 +0200 |
|---|---|---|
| committer | Ian Jackson <Ian.Jackson@eu.citrix.com> | 2013-07-17 11:58:08 +0100 |
| commit | 5e0288ecf2d6e88db03ad2c31801b3bed77907a8 (patch) | |
| tree | 144b1fc272b587cbc98acd5c04e4174b1fe3bac5 | |
| parent | 625adff3a665e0edcce6fc96b269379263f4ff6d (diff) | |
| download | xen-5e0288ecf2d6e88db03ad2c31801b3bed77907a8.tar.gz xen-5e0288ecf2d6e88db03ad2c31801b3bed77907a8.tar.bz2 xen-5e0288ecf2d6e88db03ad2c31801b3bed77907a8.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>
(cherry picked from commit d513814db6af2b298b8776d7ffc5fb1261e176f4)
| -rw-r--r-- | 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 c4f543d196..237d4d7b45 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,)) |