Marcel Mol
2013-Jun-22 20:33 UTC
[PATCH] pygrub/GrubConf: fix boot problem for fedora 19 grub.cfg
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. --- 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
2013-Jun-23 08:11 UTC
[PATCH] pygrub/GrubConf: fix boot problem for fedora 19 grub.cfg
Booting a fedora 19 domU failed because a it could not properly parse the grub.cfg file. This was caused 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. --- 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
Konrad Rzeszutek Wilk
2013-Jun-24 13:50 UTC
Re: [PATCH] pygrub/GrubConf: fix boot problem for fedora 19 grub.cfg
On Sat, Jun 22, 2013 at 10:33:55PM +0200, Marcel 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.Hey Marcel, Could you also attach your SoB on this patch please? Here is what it means: To improve tracking of who did what, especially with patches that can percolate to their final resting place in the kernel through several layers of maintainers, we''ve introduced a "sign-off" procedure on patches that are being emailed around. The sign-off is a simple line at the end of the explanation for the patch, which certifies that you wrote it or otherwise have the right to pass it on as an open-source patch. The rules are pretty simple: if you can certify the below: Developer''s Certificate of Origin 1.1 By making a contribution to this project, I certify that: (a) The contribution was created in whole or in part by me and I have the right to submit it under the open source license indicated in the file; or (b) The contribution is based upon previous work that, to the best of my knowledge, is covered under an appropriate open source license and I have the right under that license to submit that work with modifications, whether created in whole or in part by me, under the same open source license (unless I am permitted to submit under a different license), as indicated in the file; or (c) The contribution was provided directly to me by some other person who certified (a), (b) or (c) and I have not modified it. (d) I understand and agree that this project and the contribution are public and that a record of the contribution (including all personal information I submit with it, including my sign-off) is maintained indefinitely and may be redistributed consistent with this project or the open source license(s) involved. then you just add a line saying Signed-off-by: Random J Developer <random@developer.example.org> using your real name (sorry, no pseudonyms or anonymous contributions.)