[Xen-changelog] [xen stable-4.1] pygrub: add Debian extlinux.conf path

[patchbot@xxxxxxx]

commit f02ec246e8323d63951880d221eea8d05af13c20
Author:     Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
AuthorDate: Tue Sep 3 15:45:11 2013 +0100
Commit:     Ian Jackson <Ian.Jackson@xxxxxxxxxxxxx>
CommitDate: Tue Sep 3 15:45:11 2013 +0100

    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@xxxxxxxxxxxxxx>
    Acked-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
    (cherry picked from commit 258d27a1d9fb33a490bef1381f52d522225c3dca)
    
    Conflicts:
        tools/pygrub/src/pygrub
    Signed-off-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
---
 tools/pygrub/src/pygrub |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/tools/pygrub/src/pygrub b/tools/pygrub/src/pygrub
index f65f22c..0759d33 100644
--- a/tools/pygrub/src/pygrub
+++ b/tools/pygrub/src/pygrub
@@ -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:
--
generated by git-patchbot for /home/xen/git/xen.git#stable-4.1

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