Attachment 559927 Details for Bug 824609

[patch] perl bootloader patch to fix parsing kernel append in grub.cfg

0001-Fix-installation-boot-parameters-not-written.patch (text/plain), 1.91 KB, created by Michael Chang on 2013-09-25 07:20:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Chang

Created: 2013-09-25 07:20:36 UTC

Size: 1.91 KB

patch

obsolete

>From a79d6de47c98338ac164920653f29d5d67919f4a Mon Sep 17 00:00:00 2001
>From: Michael Chang <mchang@suse.com>
>Date: Wed, 25 Sep 2013 14:51:24 +0800
>Subject: [PATCH] Fix installation boot parameters not written
>
>When uefi secure boot enabled, the linuxefi command will be used to load
>and verify kernel image signature. The grub.cfg parsing has to match
>this command in order to return image section information structure to
>yast, if not the append will not found in the image section and will
>lost if writing to disk. (bnc#824609)
>---
> src/Core/GRUB2EFI.pm |   15 ++++++++++++---
> 1 files changed, 12 insertions(+), 3 deletions(-)
>
>diff --git a/src/Core/GRUB2EFI.pm b/src/Core/GRUB2EFI.pm
>index 16ef168..71d9c41 100644
>--- a/src/Core/GRUB2EFI.pm
>+++ b/src/Core/GRUB2EFI.pm
>@@ -88,15 +88,24 @@ sub GrubCfgSections {
>                 $sect_info{"usage"} = "linux";
>             }
> 
>-            if ($cfg2 =~ /^\s+linux\s+([^\s]+)\s*(.*)$/m) {
>-                my $append = $2;
>-                $sect_info{"image"} = $1;
>+            # bnc#824609 - installation boot parameters not written to GRUB_CMDLINE_LINUX_DEFAULT
>+            # we need to match linuxefi command, otherwise the kernel append will lost
>+            if ($cfg2 =~ /^\s+(linux|linuxefi)\s+([^\s]+)\s*(.*)$/m) {
>+                my $append = $3;
>+                $sect_info{"image"} = $2;
>+                my $command = $1;
> 
>                 if ($append =~ /root=/) {
>                     $append =~ s/root=([^\s]+)\s*//;
>                     $sect_info{"root"} = $1;
>                 }
> 
>+                # the ro is part of linuxefi entries created by grub2 scripts
>+                # not part of kernel append by yast
>+                if ( $command eq "linuxefi" ) {
>+                    $append =~ s/^ro\s*//;
>+                }
>+
>                 if ($append =~ /vga=/) {
>                     $append =~ s/vga=([^\s]+)\s*//;
>                     $sect_info{"vgamode"} = $1;
>-- 
>1.7.3.4
>

Actions: View | Diff

Attachments on bug 824609: 543850 | 559927