From edcd551074a9880c98f873940a982290c2fdaf25 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mageia.org>
Date: Fri, 31 May 2013 09:34:44 +0000
Subject: (write_grub2) read/save choosen default entry

---
 perl-install/NEWS          |  1 +
 perl-install/bootloader.pm | 10 ++++++++++
 perl-install/install/NEWS  |  1 +
 3 files changed, 12 insertions(+)

diff --git a/perl-install/NEWS b/perl-install/NEWS
index b75a29c87..9698c2a8e 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,5 +1,6 @@
 - drakboot:
   o fix displaying need to install acpi* packages when they're already installed
+  o read/save choosen default entry
 - finish-install:
   kbluetooth is replaced by bluedevil, (#10082)
 
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index 74601d740..dea5bf0bd 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -252,6 +252,11 @@ sub read_grub2 {
 	}
     }
 
+    # get default entry:
+    foreach (run_program::rooted_get_stdout($::prefix, qw(grub2-editenv list))) {
+	$bootloader{default} = $1 if /saved_entry=(.*)/;
+    }
+
     $bootloader{method} = 'grub2';
     \%bootloader;
 }
@@ -1813,6 +1818,11 @@ sub write_grub2 {
 
     my $grub2_cfg = '/boot/grub2/grub.cfg';
     run_program::rooted($::prefix, 'grub2-mkconfig', '2>', \$error, '-o', $grub2_cfg) or die "grub2-mkconfig failed: $error";
+
+    # set default entry:
+    eval {
+	run_program::rooted($::prefix, 'grub2-set-default', '2>', \$error, $bootloader->{default}) or die "grub2-mkconfig failed: $error";
+    };
 }
 
 sub write_grub {
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index b06abfb26..e5934e6e4 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,5 +1,6 @@
 - bootloader:
   o fix displaying need to install acpi* packages when they're already installed
+  o read/save choosen default entry
 
 Version 15.54 - 17 May 2013
 
-- 
cgit v1.2.1