]> xenbits.xensource.com Git - xen.git/commitdiff
pygrub: add Debian extlinux.conf path
authorIan Campbell <ijc@hellion.org.uk>
Fri, 16 Aug 2013 14:21:05 +0000 (15:21 +0100)
committerIan Jackson <Ian.Jackson@eu.citrix.com>
Tue, 3 Sep 2013 14:35:36 +0000 (15:35 +0100)
This is Debian bug #697407.

http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=697407

Signed-off-by: Ian Campbell <ijc@hellion.org.uk>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
(cherry picked from commit 258d27a1d9fb33a490bef1381f52d522225c3dca)

tools/pygrub/src/pygrub

index eedfdb2fbf3914ba6b10a17da50849bad0704392..bcdd60288e231f3b7af11ae6b54b7ec222cb69f1 100644 (file)
@@ -430,6 +430,7 @@ class Grub:
                             "/boot/grub2/grub.cfg", "/grub2/grub.cfg"]) + \
                        map(lambda x: (x,grub.ExtLinuxConf.ExtLinuxConfigFile),
                            ["/boot/isolinux/isolinux.cfg",
+                            "/boot/extlinux/extlinux.conf",
                             "/boot/extlinux.conf"]) + \
                        map(lambda x: (x,grub.GrubConf.GrubConfigFile),
                            ["/boot/grub/menu.lst", "/boot/grub/grub.conf",