From 314fa0df12e087fd9c6bb039db4e19f24dc3cbd5 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Wed, 5 Mar 2008 11:37:56 +0000
Subject: - draksplash: do not re-install grub, only modify grub's config file

(it may help for bug #37203)
---
 perl-install/NEWS                |  1 +
 perl-install/standalone/drakboot | 10 ++++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/perl-install/NEWS b/perl-install/NEWS
index 85547821b..cfee1f65f 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,5 +1,6 @@
 - adapt to new kernel-2.6.25's sysfs layout (Eric Pielbug, #38235)
 - diskdrake: use ntfs-3g by default for ntfs partitions
+- draksplash: do not re-install grub, only modify grub's config file
 - select proper padlock module for Via CPU (#38311)
 
 Version 10.7 - 3 March 2008
diff --git a/perl-install/standalone/drakboot b/perl-install/standalone/drakboot
index 08ce80345..d0a8ef826 100755
--- a/perl-install/standalone/drakboot
+++ b/perl-install/standalone/drakboot
@@ -242,7 +242,7 @@ sub set_splash_append {
     my ($val) = @_;
     bootloader::set_append_with_key($bootloader, 'splash', undef);
     bootloader::set_append_with_key($bootloader, 'splash', $val);
-    bootloader::install($bootloader, $all_hds);
+    modify_bootloader($bootloader, $all_hds);
 }
 
 sub enable_framebuffer() {
@@ -275,10 +275,16 @@ Be sure your video card supports the mode you choose."),
                 my $entry = find { $_->{label} eq $label } @{$bootloader->{entries}};
                 $entry->{vga} = $vga;
             }
-            bootloader::install($bootloader, $all_hds);
+            modify_bootloader($bootloader, $all_hds);
         }
     };
     die if $@ && $@ !~ /^wizcancel/;
     $::WizardWindow->destroy unless $::isEmbedded;
     $vga;
 }
+
+sub modify_bootloader {
+    my ($bootloader, $all_hds) = @_;
+    bootloader::action($bootloader, 'write', $all_hds);
+    bootloader::action($bootloader, 'when_config_changed');
+}
-- 
cgit v1.2.1