Attachment 9116 Details for Bug 18783 – Revert "do not alter /etc/default/grub on kernel updates"

[patch] Revert "do not alter /etc/default/grub on kernel updates"

0001-Revert-do-not-alter-etc-default-grub-on-kernel-updat.patch (text/plain), 1.56 KB, created by Thierry Vignaud on 2017-03-19 04:00:39 CET

(hide)

Description:

Filename:

MIME Type:

Creator: Thierry Vignaud

Created: 2017-03-19 04:00:39 CET

Size: 1.56 KB

patch

obsolete

>From 2d54363d66b4cdcb158d1c3f8cbe33ff4409b939 Mon Sep 17 00:00:00 2001
>From: Thierry Vignaud <thierry.vignaud@gmail.com>
>Date: Sun, 19 Mar 2017 03:52:49 +0100
>Subject: [PATCH 1/2] Revert "do not alter /etc/default/grub on kernel updates"
>
>This reverts commit 7bb01fb038e0a882e755b963110bda381336b748 and
>commit 4c1cb5006360ccb780926000bd57f150e0fc8fbe
>---
> perl-install/bootloader.pm | 10 ++++++----
> 1 file changed, 6 insertions(+), 4 deletions(-)
>
>diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
>index 5269203..8983dd6 100644
>--- a/perl-install/bootloader.pm
>+++ b/perl-install/bootloader.pm
>@@ -1897,14 +1897,18 @@ sub write_grub2_default_entry {
>     }
> }
> 
>-sub write_grub2() {
>+sub write_grub2 {
>+    my ($bootloader, $o_all_hds, $o_backup_extension) = @_;
>     my $error;
> 
>+    write_grub2_sysconfig($bootloader, $o_all_hds, $o_backup_extension);
>+
>     my $f1 = "$::prefix/boot/grub2/grub.cfg";
>     renamef($f1, $f1 . '.old');
>     run_program::rooted($::prefix, 'update-grub2', '2>', \$error) or die "update-grub2 failed: $error";
>     log::l("update-grub2 logs: $error");
> 
>+    write_grub2_default_entry($bootloader, $o_all_hds, $o_backup_extension);
>     check_enough_space();
> }
> 
>@@ -2123,9 +2127,7 @@ sub restore_previous_MBR_bootloader {
> 
> sub install_grub2 {
>     my ($bootloader, $all_hds) = @_;
>-    write_grub2_sysconfig($bootloader, $all_hds);
>-    write_grub2();
>-    write_grub2_default_entry($bootloader, $all_hds);
>+    write_grub2($bootloader, $all_hds);
>     write_grub2_install_sh($bootloader, '.old');
>     install_raw_grub2();
> }
>-- 
>2.9.3
>

From 2d54363d66b4cdcb158d1c3f8cbe33ff4409b939 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <thierry.vignaud@gmail.com>
Date: Sun, 19 Mar 2017 03:52:49 +0100
Subject: [PATCH 1/2] Revert "do not alter /etc/default/grub on kernel updates"

This reverts commit 7bb01fb038e0a882e755b963110bda381336b748 and
commit 4c1cb5006360ccb780926000bd57f150e0fc8fbe
---
 perl-install/bootloader.pm | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index 5269203..8983dd6 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -1897,14 +1897,18 @@ sub write_grub2_default_entry {
     }
 }
 
-sub write_grub2() {
+sub write_grub2 {
+    my ($bootloader, $o_all_hds, $o_backup_extension) = @_;
     my $error;
 
+    write_grub2_sysconfig($bootloader, $o_all_hds, $o_backup_extension);
+
     my $f1 = "$::prefix/boot/grub2/grub.cfg";
     renamef($f1, $f1 . '.old');
     run_program::rooted($::prefix, 'update-grub2', '2>', \$error) or die "update-grub2 failed: $error";
     log::l("update-grub2 logs: $error");
 
+    write_grub2_default_entry($bootloader, $o_all_hds, $o_backup_extension);
     check_enough_space();
 }
 
@@ -2123,9 +2127,7 @@ sub restore_previous_MBR_bootloader {
 
 sub install_grub2 {
     my ($bootloader, $all_hds) = @_;
-    write_grub2_sysconfig($bootloader, $all_hds);
-    write_grub2();
-    write_grub2_default_entry($bootloader, $all_hds);
+    write_grub2($bootloader, $all_hds);
     write_grub2_install_sh($bootloader, '.old');
     install_raw_grub2();
 }
-- 
2.9.3

Actions: View | Diff

Attachments on bug 18783: 9116 | 9117