From 82d2b39d94fc0d03ead94ddcdb9f40e8db14d846bd98c70b13c4ee5c3dd523be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Tesa=C5=99=C3=ADk?= Date: Tue, 7 Apr 2020 12:45:24 +0000 Subject: [PATCH 1/2] Update patch upstream status. OBS-URL: https://build.opensuse.org/package/show/Kernel:kdump/kexec-tools?expand=0&rev=128 --- kexec-tools-fix-kexec_file_load-error-handling.patch | 3 ++- kexec-tools-reset-getopt-before-falling-back-to-legacy.patch | 3 ++- kexec-tools-s390-Reset-kernel-command-line-on-syscal.patch | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/kexec-tools-fix-kexec_file_load-error-handling.patch b/kexec-tools-fix-kexec_file_load-error-handling.patch index e626fc4..b615e82 100644 --- a/kexec-tools-fix-kexec_file_load-error-handling.patch +++ b/kexec-tools-fix-kexec_file_load-error-handling.patch @@ -1,9 +1,10 @@ From 0ec1fd23847ba103f967e3377e2a1b13712cff6e Mon Sep 17 00:00:00 2001 From: Petr Tesarik Date: Thu, 12 Mar 2020 20:12:12 +0100 -Upstream: not yet, patch sent 2020-03-12 Subject: Fix kexec_file_load(2) error handling References: bsc#1166105 +Upstream: merged +Git-commit: 4f77da6340356de40af70473d3c3ae6ec663fbdf The handling of kexec_file_load() error conditions needs some improvement. diff --git a/kexec-tools-reset-getopt-before-falling-back-to-legacy.patch b/kexec-tools-reset-getopt-before-falling-back-to-legacy.patch index 9bcc96a..e9b0e39 100644 --- a/kexec-tools-reset-getopt-before-falling-back-to-legacy.patch +++ b/kexec-tools-reset-getopt-before-falling-back-to-legacy.patch @@ -1,9 +1,10 @@ From dadafc4664c7b78ea1561ccca33986c9639106ec Mon Sep 17 00:00:00 2001 From: Petr Tesarik Date: Fri, 13 Mar 2020 14:54:00 +0100 -Upstream: not yet, patch sent 2020-03-13 Subject: Reset getopt before falling back to legacy syscall References: bsc#1166105 +Upstream: merged +Git-commit: 9cf721279f6cb0dec09c8752e471f15fb662406b The modules may need to parse the arguments again after kexec_file_load(2) failed, but getopt is not reset. diff --git a/kexec-tools-s390-Reset-kernel-command-line-on-syscal.patch b/kexec-tools-s390-Reset-kernel-command-line-on-syscal.patch index 08ea841..011717e 100644 --- a/kexec-tools-s390-Reset-kernel-command-line-on-syscal.patch +++ b/kexec-tools-s390-Reset-kernel-command-line-on-syscal.patch @@ -2,7 +2,8 @@ From: Petr Tesarik Date: Fri, 3 Apr 2020 13:12:00 +0200 Subject: kexec-tools: s390: Reset kernel command line on syscall fallback References: bsc#1167868 -Upstream: submitted 2020-04-03 +Upstream: merged +Git-commit: 5dc72ded6050a5bb161e3b832867e660c9ca009e The command line is duplicated on s390 if kexec_file_load(2) is not implemented. That's because the corresponding variable is not reset From 52738029dd1c22b80637bbdec1d318a850e103a43720e08bf0771a88cd51eff4 Mon Sep 17 00:00:00 2001 From: Thomas Renninger Date: Thu, 20 Aug 2020 09:16:55 +0000 Subject: [PATCH 2/2] Accepting request 811718 from home:bmwiedemann:branches:Kernel:kdump Make kexec-bootloader work without 'which' package (boo#1172501) OBS-URL: https://build.opensuse.org/request/show/811718 OBS-URL: https://build.opensuse.org/package/show/Kernel:kdump/kexec-tools?expand=0&rev=129 --- kexec-bootloader | 6 ------ kexec-tools.changes | 5 +++++ 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/kexec-bootloader b/kexec-bootloader index 350eb15..595ad33 100644 --- a/kexec-bootloader +++ b/kexec-bootloader @@ -189,12 +189,6 @@ if ($initrd && ! -f $initrd) { exit(1); } -# Do we have kexec? -if (system("which kexec &>/dev/null") != 0) { - print STDERR "kexec not available. Install kexec-tools.\n"; - exit(1); -} - # build the command list my $cmd = "kexec"; diff --git a/kexec-tools.changes b/kexec-tools.changes index 56441d8..c94debf 100644 --- a/kexec-tools.changes +++ b/kexec-tools.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Jun 5 09:36:21 UTC 2020 - Bernhard Wiedemann + +- Make kexec-bootloader work without 'which' package (boo#1172501) + ------------------------------------------------------------------- Fri Apr 3 12:11:16 UTC 2020 - Petr Tesařík