[Xen-changelog] [xen master] tools/pygrub: Fix extlinux when /boot is a separate partition from /

[patchbot@xxxxxxx]

commit 0c12e5b7427b4dfd2dfabf21f6b0e6e24bc8e864
Author:     Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
AuthorDate: Wed Jun 11 19:31:55 2014 +0100
Commit:     Ian Campbell <ian.campbell@xxxxxxxxxx>
CommitDate: Wed Jun 18 16:22:48 2014 +0100

    tools/pygrub: Fix extlinux when /boot is a separate partition from /
    
    Grub and Grub2 already cope with this.
    
    Reported-by: Joseph Hom <jhom@xxxxxxxxxxxxx>
    Signed-off-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
    CC: Ian Campbell <Ian.Campbell@xxxxxxxxxx>
    CC: Ian Jackson <Ian.Jackson@xxxxxxxxxxxxx>
    Acked-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
---
 tools/pygrub/src/pygrub |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/tools/pygrub/src/pygrub b/tools/pygrub/src/pygrub
index 4c35f9d..a4a2423 100644
--- 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"])
--
generated by git-patchbot for /home/xen/git/xen.git#master

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog