From 9c6425b06a1efdb3f48357313f72c61e003436cc Mon Sep 17 00:00:00 2001
From: Andrew Cooper <andrew.cooper3@citrix.com>
Date: Wed, 11 Jun 2014 19:31:55 +0100
Subject: [PATCH] tools/pygrub: Fix extlinux when /boot is a separate partition
 from /

Grub and Grub2 already cope with this.

Reported-by: Joseph Hom <jhom@softlayer.com>
Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
CC: Ian Campbell <Ian.Campbell@citrix.com>
CC: Ian Jackson <Ian.Jackson@eu.citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
(cherry picked from commit 0c12e5b7427b4dfd2dfabf21f6b0e6e24bc8e864)

Conflicts:
	tools/pygrub/src/pygrub

Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
---
 tools/pygrub/src/pygrub | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tools/pygrub/src/pygrub b/tools/pygrub/src/pygrub
index 45a72902c4..d0199bc7fd 100644
--- a/tools/pygrub/src/pygrub
+++ b/tools/pygrub/src/pygrub
@@ -431,7 +431,9 @@ class Grub:
                        map(lambda x: (x,grub.ExtLinuxConf.ExtLinuxConfigFile),
                            ["/boot/isolinux/isolinux.cfg",
                             "/boot/extlinux/extlinux.conf",
-                            "/boot/extlinux.conf"]) + \
+                            "/boot/extlinux.conf",
+                            "/extlinux/extlinux.conf",
+                            "/extlinux.conf"]) + \
                        map(lambda x: (x,grub.GrubConf.GrubConfigFile),
                            ["/boot/grub/menu.lst", "/boot/grub/grub.conf",
                             "/grub/menu.lst", "/grub/grub.conf"])
-- 
2.39.5