From 47ef2470c2d294f45f150fa8aecfd004078463f1 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mageia.org>
Date: Wed, 27 Feb 2013 06:40:12 +0000
Subject: read & save timeout value (mga#8850)

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

(limited to 'perl-install')

diff --git a/perl-install/NEWS b/perl-install/NEWS
index 853bcecd4..bda66d1c1 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,6 +1,7 @@
 - drakboot:
   o fix detecting grub2 if there's a remaining grub-legacy signature
   o read more of grub2 config
+  o read & save timeout value (mga#8850)
   o set default parameters in grub2 config (mga#9177)
 
 Version 15.21 - 26 February 2013
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index 0a3363d52..44e85e635 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -235,6 +235,8 @@ sub read {
 
 sub read_grub2 {
     my %bootloader = getVarsFromSh("$::prefix/boot/grub2/drakboot.conf");
+    my %h = getVarsFromSh("$::prefix/etc/default/grub");
+    $bootloader{timeout} = $h{GRUB_TIMEOUT};
     $bootloader{entries} = [];
     my $entry;
     foreach (cat_("$::prefix/boot/grub2/grub.cfg")) {
@@ -1804,6 +1806,7 @@ sub write_grub2 {
     my $f = "$::prefix/etc/default/grub";
     my %conf = getVarsFromSh($f);
     $conf{GRUB_CMDLINE_LINUX_DEFAULT} = $append;
+    $conf{GRUB_TIMEOUT} = $bootloader->{timeout};
     setVarsInSh($f, \%conf);
 
     my $grub2_cfg = '/boot/grub2/grub.cfg';
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index b77bb223f..f8b5cf45a 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,6 +1,7 @@
 - bootloader:
   o fix detecting grub2 if there's a remaining grub-legacy signature
   o read more of grub2 config
+  o read & save timeout value (mga#8850)
   o set default parameters in grub2 config (mga#9177)
 - do not attempt to use gurpmi.addmedia or gurpmi if in text mode
 
-- 
cgit v1.2.1