a8d0abb1da
patch to 4.5.0, or update pkgs to 4.5.1 5513b458-allow-reboot-overrides-when-running-under-EFI.patch 5513b4d1-dont-apply-reboot-quirks-if-reboot-set-by-user.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=360
40 lines
1.3 KiB
Diff
40 lines
1.3 KiB
Diff
Subject: x86: don't apply reboot quirks if reboot set by user
|
|
From: Ross Lagerwall ross.lagerwall@citrix.com Thu Mar 26 08:27:13 2015 +0100
|
|
Date: Thu Mar 26 08:27:13 2015 +0100:
|
|
Git: 7fe1c1b28581686aca42361d4fee740c643dde1b
|
|
|
|
If reboot= is specified on the command-line, don't apply reboot quirks
|
|
to allow the command-line option to take precedence.
|
|
|
|
This is a port of Linux commit 5955633e91bf ("x86/reboot: Skip DMI
|
|
checks if reboot set by user").
|
|
|
|
Signed-off-by: Ross Lagerwall <ross.lagerwall@citrix.com>
|
|
|
|
Leverage (and make apply on top of) c643fb110a ("x86/EFI: allow
|
|
reboot= overrides when running under EFI").
|
|
|
|
Signed-off-by: Jan Beulich <jbeulich@suse.com>
|
|
Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>
|
|
master commit: 9832f5e8e3575f8affceb2751f7422704bf7b446
|
|
master date: 2015-03-13 12:41:51 +0100
|
|
|
|
diff --git a/xen/arch/x86/shutdown.c b/xen/arch/x86/shutdown.c
|
|
index d2bb24b..9ec8f97 100644
|
|
--- a/xen/arch/x86/shutdown.c
|
|
+++ b/xen/arch/x86/shutdown.c
|
|
@@ -464,6 +464,13 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = {
|
|
|
|
static int __init reboot_init(void)
|
|
{
|
|
+ /*
|
|
+ * Only do the DMI check if reboot_type hasn't been overridden
|
|
+ * on the command line
|
|
+ */
|
|
+ if ( reboot_type != BOOT_INVALID )
|
|
+ return 0;
|
|
+
|
|
default_reboot_type();
|
|
dmi_check_system(reboot_dmi_table);
|
|
return 0;
|