Attachment 6592 Details for Bug 15984 – fix default grub2 kernel parameters

[patch] fix default grub2 kernel parameters

15984.diff (text/plain), 1.34 KB, created by Thierry Vignaud on 2015-05-20 12:01:19 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Thierry Vignaud

Created: 2015-05-20 12:01:19 CEST

Size: 1.34 KB

patch

obsolete

>commit 199cc1ddadb5e7c364513acdf6173a1aa0b49bfa
>Author: Thierry Vignaud <thierry.vignaud@gmail.com>
>Date:   Wed May 20 03:38:54 2015 -0400
>
>    fix default grub2 kernel parameters (mga#15984)
>
>diff --git a/perl-install/NEWS b/perl-install/NEWS
>index 435f23e..2ebe373 100644
>--- a/perl-install/NEWS
>+++ b/perl-install/NEWS
>@@ -1,5 +1,6 @@
> - drakboot:
>   o do not detect grub2 on UEFI when there's no bootloader
>+  o fix default grub2 kernel parameters (mga#15984)
> 
> Version 16.98 - 19 May 2015
> 
>diff --git a/perl-install/any.pm b/perl-install/any.pm
>index a6be98d..c37c444 100644
>--- a/perl-install/any.pm
>+++ b/perl-install/any.pm
>@@ -618,7 +618,7 @@ sub setupBootloader__grub2 {
>     my $b2 = bootloader::read_grub2();
> 
>     # get default parameters:
>-    my $append = bootloader::get_grub2_append($b2);
>+    my $append = $b->{entries}[0]{append} ||= bootloader::get_grub2_append($b2);
>     my $default = $b2->{default};
> 
>     require Xconfig::resolution_and_depth;
>diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
>index f3476f3..c4ee822 100644
>--- a/perl-install/install/NEWS
>+++ b/perl-install/install/NEWS
>@@ -1,5 +1,6 @@
> - bootloader:
>   o do not detect grub2 on UEFI when there's no bootloader
>+  o fix default grub2 kernel parameters (mga#15984)
> - don't try to install non existant scim-googlepinyin (mga#6681)
> 
> Version 16.97 - 18 May 2015

commit 199cc1ddadb5e7c364513acdf6173a1aa0b49bfa
Author: Thierry Vignaud <thierry.vignaud@gmail.com>
Date:   Wed May 20 03:38:54 2015 -0400

    fix default grub2 kernel parameters (mga#15984)

diff --git a/perl-install/NEWS b/perl-install/NEWS
index 435f23e..2ebe373 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,5 +1,6 @@
 - drakboot:
   o do not detect grub2 on UEFI when there's no bootloader
+  o fix default grub2 kernel parameters (mga#15984)
 
 Version 16.98 - 19 May 2015
 
diff --git a/perl-install/any.pm b/perl-install/any.pm
index a6be98d..c37c444 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -618,7 +618,7 @@ sub setupBootloader__grub2 {
     my $b2 = bootloader::read_grub2();
 
     # get default parameters:
-    my $append = bootloader::get_grub2_append($b2);
+    my $append = $b->{entries}[0]{append} ||= bootloader::get_grub2_append($b2);
     my $default = $b2->{default};
 
     require Xconfig::resolution_and_depth;
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index f3476f3..c4ee822 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,5 +1,6 @@
 - bootloader:
   o do not detect grub2 on UEFI when there's no bootloader
+  o fix default grub2 kernel parameters (mga#15984)
 - don't try to install non existant scim-googlepinyin (mga#6681)
 
 Version 16.97 - 18 May 2015

Actions: View | Diff

Attachments on bug 15984: 6581 | 6582 | 6583 | 6592