From mboxrd@z Thu Jan 1 00:00:00 1970 From: Konrad Rzeszutek Wilk Subject: Re: [PATCH] pygrub/GrubConf: fix boot problem for fedora 19 grub.cfg (2nd attempt) Date: Wed, 26 Jun 2013 11:01:00 -0400 Message-ID: <20130626150100.GA6037@phenom.dumpdata.com> References: <20130624162132.GA16610@joshua.mesa.nl> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Content-Disposition: inline In-Reply-To: <20130624162132.GA16610@joshua.mesa.nl> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: "Marcel J.E. Mol" , george.dunlap@eu.citrix.com, ian.jackson@eu.citrix.com Cc: xen-devel@lists.xen.org List-Id: xen-devel@lists.xenproject.org On Mon, Jun 24, 2013 at 06:21:32PM +0200, Marcel J.E. Mol wrote: > 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 Excellent, and also Tested-by: Konrad Rzeszutek Wilk and it also fixes Red Hat bug: 978036 George, would you be OK putting this in 4.3? > --- > 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 > > _______________________________________________ > Xen-devel mailing list > Xen-devel@lists.xen.org > http://lists.xen.org/xen-devel >