81501c15a5
23686-pygrub-solaris.patch 23697-pygrub-grub2.patch 23944-pygrub-debug.patch 23998-pygrub-GPT.patch 23999-pygrub-grub2.patch 24064-pygrub-HybridISO.patch 24401-pygrub-scrolling.patch 24402-pygrub-edit-fix.patch 24460-pygrub-extlinux.patch 24706-pygrub-extlinux.patch - Revised version of security patch and an additional patch for bnc#764077 x86_64-AMD-erratum-121.patch x86_64-allow-unsafe-adjust.patch - bnc#764077 - VUL-0: EMBARGOED: xen: XSA-9: denial of service on older AMD systems x86_64-AMD-erratum-121.patch - Revised version of security patch for bnc#757537 x86_64-sysret-canonical.patch - bnc#757537 - VUL-0: xen: CVE-2012-0217 PV guest escalation x86_64-sysret-canonical.patch - bnc#757970 - VUL-1: xen: guest denial of service on syscall GPF generation x86_64-trap-bounce-flags.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=190
37 lines
1.7 KiB
Diff
37 lines
1.7 KiB
Diff
# HG changeset patch
|
|
# User Ian Campbell <ian.campbell@citrix.com>
|
|
# Date 1310749975 -3600
|
|
# Node ID 5e1032229546c2d5640dc05205303d91d78a92c3
|
|
# Parent c1d7fa123dae73708da7306c0ec611d6fa6a6140
|
|
pygrub: prefer Grub2 to Grub1
|
|
|
|
If a VM image has grub2 installed it is likely the one we need to be using.
|
|
|
|
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
|
|
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
|
|
Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>
|
|
|
|
diff -r c1d7fa123dae -r 5e1032229546 tools/pygrub/src/pygrub
|
|
--- a/tools/pygrub/src/pygrub Fri Jul 15 18:09:49 2011 +0100
|
|
+++ b/tools/pygrub/src/pygrub Fri Jul 15 18:12:55 2011 +0100
|
|
@@ -385,14 +385,14 @@
|
|
# fallbacks
|
|
["/efi/boot/elilo.conf", "/elilo.conf",])
|
|
else:
|
|
- cfg_list = map(lambda x: (x,grub.GrubConf.GrubConfigFile),
|
|
- ["/boot/grub/menu.lst", "/boot/grub/grub.conf",
|
|
- "/grub/menu.lst", "/grub/grub.conf"]) + \
|
|
- map(lambda x: (x,grub.GrubConf.Grub2ConfigFile),
|
|
+ cfg_list = map(lambda x: (x,grub.GrubConf.Grub2ConfigFile),
|
|
["/boot/grub/grub.cfg", "/grub/grub.cfg"]) + \
|
|
map(lambda x: (x,grub.ExtLinuxConf.ExtLinuxConfigFile),
|
|
["/boot/isolinux/isolinux.cfg",
|
|
- "/boot/extlinux.conf"])
|
|
+ "/boot/extlinux.conf"]) + \
|
|
+ map(lambda x: (x,grub.GrubConf.GrubConfigFile),
|
|
+ ["/boot/grub/menu.lst", "/boot/grub/grub.conf",
|
|
+ "/grub/menu.lst", "/grub/grub.conf"])
|
|
|
|
if not fs:
|
|
# set the config file and parse it
|