diff options
| author | Thierry Vignaud <thierry.vignaud@gmail.com> | 2015-05-20 03:38:54 -0400 |
|---|---|---|
| committer | Thierry Vignaud <thierry.vignaud@gmail.com> | 2015-05-20 18:34:47 +0200 |
| commit | 916e112f0d5fe753be24db15bc8555f8058699f0 (patch) | |
| tree | 0565148d89fcde3de436eb37d0094a480c76ac9f | |
| parent | ab9277b3b0dd782ac099399b229e43f42da76952 (diff) | |
| download | drakx-916e112f0d5fe753be24db15bc8555f8058699f0.tar drakx-916e112f0d5fe753be24db15bc8555f8058699f0.tar.gz drakx-916e112f0d5fe753be24db15bc8555f8058699f0.tar.bz2 drakx-916e112f0d5fe753be24db15bc8555f8058699f0.tar.xz drakx-916e112f0d5fe753be24db15bc8555f8058699f0.zip | |
fix default grub2 kernel parameters (mga#15984)
| -rw-r--r-- | perl-install/NEWS | 1 | ||||
| -rw-r--r-- | perl-install/any.pm | 2 | ||||
| -rw-r--r-- | perl-install/install/NEWS | 1 |
3 files changed, 3 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS index f83016b9c..e040d2c9c 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -3,6 +3,7 @@ o set the proper GUID for FAT partitions on GPT - 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 a6be98d7e..c37c444c6 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 7001c0ba1..d76bb8f9e 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) - partitioning: o fix mnt point for FAT partitions on GTP (mga#15987) o set the proper GUID for FAT partitions on GPT |