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
30 lines
1.2 KiB
Diff
30 lines
1.2 KiB
Diff
# HG changeset patch
|
|
# User Roger Pau Monne <roger.pau@entel.upc.edu>
|
|
# Date 1328635287 0
|
|
# Node ID f84f34ec5fc7613d7a6dd53d18218656c11f0daa
|
|
# Parent 7a58296824c3bf7a15d563a7a140d20c369c96c8
|
|
pygrub: extlinux parsing correctness
|
|
|
|
The "in" operator should be used instead of the find method, since
|
|
we are only interested in knowing whether the line contains "initrd=",
|
|
but we don't care about it's position. Also fixes an error that
|
|
happens when initrd= it's at the start of the line, since find returns
|
|
0 and is evaluated as False.
|
|
|
|
Signed-off-by: Roger Pau Monne <roger.pau@entel.upc.edu>
|
|
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
|
|
Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>
|
|
|
|
diff -r 7a58296824c3 -r f84f34ec5fc7 tools/pygrub/src/ExtLinuxConf.py
|
|
--- a/tools/pygrub/src/ExtLinuxConf.py Tue Feb 07 17:18:10 2012 +0000
|
|
+++ b/tools/pygrub/src/ExtLinuxConf.py Tue Feb 07 17:21:27 2012 +0000
|
|
@@ -60,7 +60,7 @@
|
|
|
|
# Bypass regular self.commands handling
|
|
com = None
|
|
- elif arg.find("initrd="):
|
|
+ elif "initrd=" in arg:
|
|
# find initrd image in append line
|
|
args = arg.strip().split(" ")
|
|
for a in args:
|