[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Xen-changelog] [xen-4.1-testing] pyrgrub: cope with configurations with set default="${saved_entry}" line

# HG changeset patch
# User Michael Young <m.a.young@xxxxxxxxxxxx>
# Date 1326215307 0
# Node ID 49d73f0140772bef6a8506067741f35939adc756
# Parent  c404dbf9b3c62cadb1c621c5313531264c964dee
pyrgrub: cope with configurations with set default="${saved_entry}" line

Fedora 16 grub2 configuration file can have lines like
    set default="${saved_entry}"
and a string containing an integer is expected

Signed-off-by: Michael Young <m.a.young@xxxxxxxxxxxx>
Acked-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
Committed-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>

xen-unstable changeset: 24002:979bc34d0ad0
Backport-requested-by: Pasi Karkkainen <pasik@xxxxxx>
Committed-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>

diff -r c404dbf9b3c6 -r 49d73f014077 tools/pygrub/src/GrubConf.py
--- a/tools/pygrub/src/GrubConf.py      Tue Jan 10 17:08:22 2012 +0000
+++ b/tools/pygrub/src/GrubConf.py      Tue Jan 10 17:08:27 2012 +0000
@@ -425,6 +425,8 @@
             if self.commands.has_key(com):
                 if self.commands[com] is not None:
+                    if arg.strip() == "${saved_entry}":
+                        arg = "0"
                     setattr(self, self.commands[com], arg.strip())
                     logging.info("Ignored directive %s" %(com,))

Xen-changelog mailing list



Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.