From: Ian Campbell <ijc@hellion.org.uk>
Date: Fri, 16 Aug 2013 14:21:05 +0000 (+0100)
Subject: pygrub: add Debian extlinux.conf path
X-Git-Tag: 4.3.1-rc1~42
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=30f53a4cc56d45a86ef025a0fd8e90e4c5cefe1c;p=xen.git

pygrub: add Debian extlinux.conf path

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)
---

diff --git a/tools/pygrub/src/pygrub b/tools/pygrub/src/pygrub
index eedfdb2fbf..bcdd60288e 100644
--- a/tools/pygrub/src/pygrub
+++ b/tools/pygrub/src/pygrub
@@ -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",