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
44 lines
1.8 KiB
Diff
44 lines
1.8 KiB
Diff
# HG changeset patch
|
|
# User tools/pygrub: fix solaris kernel sniff
|
|
# Date 1310663398 -3600
|
|
# Node ID 7c39a2c0d870f9a374f181b581bcf82a2a7ff364
|
|
# Parent 5239811f92e1ffb185a50172fdcf47372e71ba7e
|
|
tools/pygrub: fix solaris kernel sniff
|
|
|
|
Solaris 11 build 163+ removes '/platform/i86xpv/kernel/unix' and only the
|
|
64-bit PV kernel file '/platform/i86xpv/kernel/amd64/unix' exists.
|
|
|
|
This patch fixes the detection.
|
|
|
|
Signed-off-by: Zhigang Wang <zhigang.x.wang@oracle.com>
|
|
Signed-off-by: Kurt Hackel <kurt.hackel@oracle.com>
|
|
Signed-off-by: Frank Che <frank.che@oracle.com>
|
|
Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>
|
|
|
|
diff -r 5239811f92e1 -r 7c39a2c0d870 tools/pygrub/src/pygrub
|
|
--- a/tools/pygrub/src/pygrub Thu Jul 14 15:49:49 2011 +0100
|
|
+++ b/tools/pygrub/src/pygrub Thu Jul 14 18:09:58 2011 +0100
|
|
@@ -594,7 +594,8 @@
|
|
# If nothing has been specified, look for a Solaris domU. If found, perform the
|
|
# necessary tweaks.
|
|
def sniff_solaris(fs, cfg):
|
|
- if not fs.file_exists("/platform/i86xpv/kernel/unix"):
|
|
+ if not fs.file_exists("/platform/i86xpv/kernel/unix") and \
|
|
+ not fs.file_exists("/platform/i86xpv/kernel/amd64/unix"):
|
|
return cfg
|
|
|
|
if not cfg["kernel"]:
|
|
@@ -602,9 +603,11 @@
|
|
fs.file_exists("/platform/i86xpv/kernel/amd64/unix"):
|
|
cfg["kernel"] = "/platform/i86xpv/kernel/amd64/unix"
|
|
cfg["ramdisk"] = "/platform/i86pc/amd64/boot_archive"
|
|
- else:
|
|
+ elif fs.file_exists("/platform/i86xpv/kernel/unix"):
|
|
cfg["kernel"] = "/platform/i86xpv/kernel/unix"
|
|
cfg["ramdisk"] = "/platform/i86pc/boot_archive"
|
|
+ else:
|
|
+ return cfg
|
|
|
|
# Unpleasant. Typically we'll have 'root=foo -k' or 'root=foo /kernel -k',
|
|
# and we need to maintain Xen properties (root= and ip=) and the kernel
|