- kexec-tools-print-error-if-kexec_file_load-fails.patch: print

error if kexec_file_load fails (bsc#1197176).

OBS-URL: https://build.opensuse.org/package/show/Kernel:kdump/kexec-tools?expand=0&rev=141

kexec-tools-print-error-if-kexec_file_load-fails.patch

@@ -0,0 +1,36 @@
+From: Hari Bathini <hbathini@linux.ibm.com>
+Date: Wed Mar 16 16:03:05 2022 +0530
+Subject: kexec-tools: print error if kexec_file_load fails
+References: bsc#1197176
+Git-commit: 1d7a308bf7349fcf1627e950159029dfccf85891
+Upstream: merged
+
+Commit 4f77da634035 ("kexec-tools: Fix kexec_file_load(2) error
+handling") introduced EFALLBACK for scenarios where fallbacking back
+to kexec_load syscall is likely to work and dropped printing error
+message for these scenarios. But printing error message for other
+failure scenarios was inadvertently dropped. Restore printing error
+message for such cases.
+
+Fixes: 4f77da634035 ("kexec-tools: Fix kexec_file_load(2) error handling")
+Cc: Petr Tesarik <ptesarik@suse.com>
+Reported-by: Nageswara R Sastry <rnsastry@linux.ibm.com>
+Tested-by: Nageswara R Sastry <rnsastry@linux.ibm.com>
+Signed-off-by: Hari Bathini <hbathini@linux.ibm.com>
+Reviewed-by: Petr Tesarik <ptesarik@suse.com>
+Signed-off-by: Simon Horman <horms@verge.net.au>
+
+---
+ kexec/kexec.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/kexec/kexec.c
++++ b/kexec/kexec.c
+@@ -1294,6 +1294,7 @@ static int do_kexec_file_load(int filein
+ 		case EMSGSIZE:
+ 			/* Reject by default. */
+ 		default:
++			fprintf(stderr, "kexec_file_load failed: %s\n", strerror(errno));
+ 			ret = EFAILED;
+ 			break;
+ 

kexec-tools.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Apr 13 07:10:02 UTC 2022 - Petr Tesařík <ptesarik@suse.com>
+
+- kexec-tools-print-error-if-kexec_file_load-fails.patch: print
+  error if kexec_file_load fails (bsc#1197176).
+
 -------------------------------------------------------------------
 Mon May  3 10:57:35 UTC 2021 - Petr Tesařík <ptesarik@suse.com>
 

kexec-tools.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package kexec-tools
 #
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -31,6 +31,7 @@ Patch3:         %{name}-disable-test.patch
 Patch4:         %{name}-vmcoreinfo-in-xen.patch
 Patch10:        %{name}-SYS_getrandom.patch
 Patch11:        %{name}-remove-duplicate-ramdisk-definition.patch
+Patch12:        %{name}-print-error-if-kexec_file_load-fails.patch
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  systemd-rpm-macros