Attachment 8015 Details for Bug 16918 – grub: only update devices.map when installing grub

[patch] grub: only update devices.map when installing grub

0001-grub-only-update-devices.map-when-installing-grub.patch (text/plain), 1.26 KB, created by Thierry Vignaud on 2016-06-17 14:43:34 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Thierry Vignaud

Created: 2016-06-17 14:43:34 CEST

Size: 1.26 KB

patch

obsolete

>From 33c2e4115694676dd18ea250456d5cb87a12b490 Mon Sep 17 00:00:00 2001
>From: Thierry Vignaud <thierry.vignaud@gmail.com>
>Date: Fri, 17 Jun 2016 14:33:36 +0200
>Subject: [PATCH 1/2] grub: only update devices.map when installing grub
>
>And only when actually installing boot loader, not when updating grub
>menu list (mga#16918)
>---
> perl-install/bootloader.pm | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
>diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
>index a70c51f..5e9ced5 100644
>--- a/perl-install/bootloader.pm
>+++ b/perl-install/bootloader.pm
>@@ -1860,7 +1860,6 @@ sub write_grub {
>     my $fstab = [ fs::get::fstab($all_hds) ]; 
>     my @legacy_floppies = detect_devices::floppies();
>     my @sorted_hds = sort_hds_according_to_bios($bootloader, $all_hds);
>-    write_grub_device_map(\@legacy_floppies, \@sorted_hds);
> 
>     my $file2grub; $file2grub = sub {
> 	my ($file) = @_;
>@@ -2065,6 +2064,10 @@ sub install_raw_grub2() {
> sub install_grub {
>     my ($bootloader, $all_hds) = @_;
> 
>+    my @legacy_floppies = detect_devices::floppies();
>+    my @sorted_hds = sort_hds_according_to_bios($bootloader, $all_hds);
>+    write_grub_device_map(\@legacy_floppies, \@sorted_hds);
>+
>     write_grub($bootloader, $all_hds);
> 
>     if (!$::testing) {
>-- 
>2.9.0
>

From 33c2e4115694676dd18ea250456d5cb87a12b490 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <thierry.vignaud@gmail.com>
Date: Fri, 17 Jun 2016 14:33:36 +0200
Subject: [PATCH 1/2] grub: only update devices.map when installing grub

And only when actually installing boot loader, not when updating grub
menu list (mga#16918)
---
 perl-install/bootloader.pm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index a70c51f..5e9ced5 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -1860,7 +1860,6 @@ sub write_grub {
     my $fstab = [ fs::get::fstab($all_hds) ]; 
     my @legacy_floppies = detect_devices::floppies();
     my @sorted_hds = sort_hds_according_to_bios($bootloader, $all_hds);
-    write_grub_device_map(\@legacy_floppies, \@sorted_hds);
 
     my $file2grub; $file2grub = sub {
 	my ($file) = @_;
@@ -2065,6 +2064,10 @@ sub install_raw_grub2() {
 sub install_grub {
     my ($bootloader, $all_hds) = @_;
 
+    my @legacy_floppies = detect_devices::floppies();
+    my @sorted_hds = sort_hds_according_to_bios($bootloader, $all_hds);
+    write_grub_device_map(\@legacy_floppies, \@sorted_hds);
+
     write_grub($bootloader, $all_hds);
 
     if (!$::testing) {
-- 
2.9.0

Actions: View | Diff

Attachments on bug 16918: 8015 | 8016