From 157d49ac630e60f470baea40982ee29ace0fe6f3 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mageia.org>
Date: Tue, 26 Feb 2013 06:35:55 +0000
Subject: (read_grub2,install_grub2) read & write /boot/grub2/drakboot.conf

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

diff --git a/perl-install/NEWS b/perl-install/NEWS
index f75c75a69..d876d8d50 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,4 +1,5 @@
 - drakboot:
+  o read & write /boot/grub2/drakboot.conf
   o prevent installing grub2 somewhere else than MBR
 - always bypass blkid cache (the cache only includes a subset of the data we need)
 
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index f15db5f51..9e8a7d66a 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -234,7 +234,7 @@ sub read {
 }
 
 sub read_grub2 {
-    {};
+    my %bootloader = getVarsFromSh("$::prefix/boot/grub2/drakboot.conf");
 }
 
 sub read_grub {
@@ -1975,6 +1975,7 @@ sub install_grub2 {
 	run_program::rooted($::prefix, 'grub2-mkconfig', '2>', \$error, '-o', $grub2_cfg) or die "grub2-mkconfig failed: $error";
     }
     run_program::rooted($::prefix, 'grub2-install', '2>', \$error, $bootloader->{boot}) or die "grub2-install failed: $error";
+    setVarsInSh("$::prefix/boot/grub2/drakboot.conf", { boot => $bootloader->{boot} });
 }
 
 sub install_grub {
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index cbfde9e29..e084750c1 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,5 +1,6 @@
 - summary:
   o prevent installing grub2 somewhere else than MBR
+  o read & write /boot/grub2/drakboot.conf
   o suggests MBR by default for grub2 too (Manuel Hiebel, #8851)
 - always bypass blkid cache (the cache only includes a subset of the data we need)
 
-- 
cgit v1.2.1