pool/kexec-tools
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 487381 from home:bmwiedemann:branches:Kernel:kdump

Browse Source 
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:
Tony Jones 2017-04-11 15:09:33 +00:00 committed by Git OBS Bridge
parent 147a3a7d0e
commit ad796763fc
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
kexec-bootloader
View File

@ -1,4 +1,4 @@
#!/usr/bin/perl #!/usr/bin/perl -w
# #
# This program is free software; you can redistribute it and/or {{{ # This program is free software; you can redistribute it and/or {{{
# modify it under the terms of the GNU General Public License # modify it under the terms of the GNU General Public License
@ -152,12 +152,13 @@ if (!$section) {
my $image=$section->{"image"}; my $image=$section->{"image"};
my $initrd=$section->{"initrd"}; 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) { if ($debug) {

5
kexec-tools.changes
View File

@ -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 Wed Feb 22 12:51:28 UTC 2017 - meissner@suse.com