Accepting request 487406 from Kernel:kdump

1

OBS-URL: https://build.opensuse.org/request/show/487406
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kexec-tools?expand=0&rev=117

kexec-bootloader

@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/perl -w
 #
 # This program is free software; you can redistribute it and/or              {{{
 # modify it under the terms of the GNU General Public License
@@ -152,12 +152,13 @@ if (!$section) {
 my $image=$section->{"image"};
 my $initrd=$section->{"initrd"};
 
-# handle btfs /@ -> /
+for my $file ($image, $initrd) {
-if (substr ($image, 0, 3) eq "/@/") {
+   # handle btfs /@ -> /
-   $image = substr ($image, 2);
+   $file =~ s!^/@/!/!;
-}
+   # handle /boot on separate partition
-if ($initrd && substr ($initrd, 0, 3) eq "/@/") {
+   if($file !~ m!^/boot/! && ! -e $file && -e "/boot$file") {
-   $initrd = substr ($initrd, 2);
+      $file="/boot$file"
+   }
 }
 
 if ($debug) {

kexec-tools.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Apr 11 14:27:09 UTC 2017 - bwiedemann@suse.com
+
+- fix kexec-bootloader with /boot partition (boo#1033599)
+
 -------------------------------------------------------------------
 Wed Feb 22 12:51:28 UTC 2017 - meissner@suse.com