Hello community,

here is the log from the commit of package kexec-tools for openSUSE:Factory 
checked in at 2017-04-20 20:47:08
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kexec-tools (Old)
 and      /work/SRC/openSUSE:Factory/.kexec-tools.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "kexec-tools"

Thu Apr 20 20:47:08 2017 rev:117 rq:487406 version:2.0.13

Changes:
--------
--- /work/SRC/openSUSE:Factory/kexec-tools/kexec-tools.changes  2017-02-26 
17:00:05.895249409 +0100
+++ /work/SRC/openSUSE:Factory/.kexec-tools.new/kexec-tools.changes     
2017-04-20 20:47:10.759953789 +0200
@@ -1,0 +2,5 @@
+Tue Apr 11 14:27:09 UTC 2017 - [email protected]
+
+- fix kexec-bootloader with /boot partition (boo#1033599)
+
+-------------------------------------------------------------------

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ kexec-bootloader ++++++
--- /var/tmp/diff_new_pack.NLSkIn/_old  2017-04-20 20:47:11.763811854 +0200
+++ /var/tmp/diff_new_pack.NLSkIn/_new  2017-04-20 20:47:11.767811288 +0200
@@ -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 @@
 my $image=$section->{"image"};
 my $initrd=$section->{"initrd"};
 
-# handle btfs /@ -> /
-if (substr ($image, 0, 3) eq "/@/") {
-   $image = substr ($image, 2);
-}
-if ($initrd && substr ($initrd, 0, 3) eq "/@/") {
-   $initrd = substr ($initrd, 2);
+for my $file ($image, $initrd) {
+   # handle btfs /@ -> /
+   $file =~ s!^/@/!/!;
+   # handle /boot on separate partition
+   if($file !~ m!^/boot/! && ! -e $file && -e "/boot$file") {
+      $file="/boot$file"
+   }
 }
 
 if ($debug) {


Reply via email to