aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIan Jackson <ian.jackson@eu.citrix.com>2013-09-03 15:45:11 +0100
committerIan Jackson <Ian.Jackson@eu.citrix.com>2013-09-03 15:45:11 +0100
commitf02ec246e8323d63951880d221eea8d05af13c20 (patch)
tree2cb18420c32a09f49ccfaf72ace0ac3d5caf3f91
parent070ab4c505934951f86f42dd8403cf62bc5822f0 (diff)
downloadxen-f02ec246e8323d63951880d221eea8d05af13c20.tar.gz
xen-f02ec246e8323d63951880d221eea8d05af13c20.tar.bz2
xen-f02ec246e8323d63951880d221eea8d05af13c20.zip
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) Conflicts: tools/pygrub/src/pygrub Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
-rw-r--r--tools/pygrub/src/pygrub1
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/pygrub/src/pygrub b/tools/pygrub/src/pygrub
index f65f22cbdd..0759d33d24 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: