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>

diff --git a/tools/pygrub/src/pygrub b/tools/pygrub/src/pygrub
index 4c35f9d10d2a4421991bc0e39927f30fcc01b674..a4a2423064bed0b834f197a80bb6c32de0b35a7d 100644 (file)
--- a/tools/pygrub/src/pygrub
+++ b/tools/pygrub/src/pygrub
@@ -418,7 +418,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"])