xen-devel.lists.xenproject.org archive mirror
 help / color / mirror / Atom feed
From: "Marcel J.E. Mol" <marcel@mesa.nl>
To: xen-devel@lists.xen.org
Subject: [PATCH] pygrub/GrubConf: fix boot problem for fedora 19 grub.cfg (2nd attempt)
Date: Mon, 24 Jun 2013 18:21:32 +0200	[thread overview]
Message-ID: <20130624162132.GA16610@joshua.mesa.nl> (raw)

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>
---
 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 629951f..6324c62 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,))
-- 
1.7.7.6

-- 
     ======--------         Marcel J.E. Mol                MESA Consulting B.V.
    =======---------        ph. +31-(0)6-54724868          P.O. Box 112
    =======---------        marcel@mesa.nl                 2630 AC  Nootdorp
__==== www.mesa.nl ---____U_n_i_x______I_n_t_e_r_n_e_t____ The Netherlands ____
 They couldn't think of a number,           Linux user 1148  --  counter.li.org
    so they gave me a name!  -- Rupert Hine  --  www.ruperthine.com

             reply	other threads:[~2013-06-24 16:21 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-06-24 16:21 Marcel J.E. Mol [this message]
2013-06-26 13:50 ` [PATCH] pygrub/GrubConf: fix boot problem for fedora 19 grub.cfg (2nd attempt) Ian Campbell
2013-06-26 18:14   ` Marcel J.E. Mol
2013-06-26 13:52 ` George Dunlap
2013-06-26 13:57   ` Wei Liu
2013-06-26 18:17   ` Marcel J.E. Mol
2013-06-26 15:01 ` Konrad Rzeszutek Wilk
2013-06-26 16:05   ` George Dunlap
2013-06-27 11:31     ` Ian Campbell
2014-04-04 15:15       ` Ian Jackson
2013-07-02 15:01 ` Konrad Rzeszutek Wilk
2013-07-02 23:07   ` Marcel J.E. Mol

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20130624162132.GA16610@joshua.mesa.nl \
    --to=marcel@mesa.nl \
    --cc=xen-devel@lists.xen.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).