Accepting request 487381 from home:bmwiedemann:branches:Kernel:kdump
fix kexec-bootloader with /boot partition (boo#1033599) also enable warnings (none to be seen atm) OBS-URL: https://build.opensuse.org/request/show/487381 OBS-URL: https://build.opensuse.org/package/show/Kernel:kdump/kexec-tools?expand=0&rev=79
This commit is contained in:
parent
147a3a7d0e
commit
ad796763fc
@ -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 /@ -> /
|
||||
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) {
|
||||
|
@ -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
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user