]> xenbits.xensource.com Git - xen.git/commitdiff
pygrub: add Debian extlinux.conf path
authorIan Jackson <ian.jackson@eu.citrix.com>
Tue, 3 Sep 2013 14:45:11 +0000 (15:45 +0100)
committerIan Jackson <Ian.Jackson@eu.citrix.com>
Tue, 3 Sep 2013 14:45:11 +0000 (15:45 +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)

Conflicts:
tools/pygrub/src/pygrub
Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
tools/pygrub/src/pygrub

index f65f22cbddfa37c136d8fe691aeee46a50f84738..0759d33d247acc3168b0b6bc30986cf5e61cb4be 100644 (file)
@@ -403,6 +403,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"])
 
         if not fs: