diff options
| author | Thierry Vignaud <tv@mageia.org> | 2013-02-27 06:40:12 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mageia.org> | 2013-02-27 06:40:12 +0000 |
| commit | 96dc12b935f9aea64963b7ea1698eac0b5a74f2f (patch) | |
| tree | da31a6df92a513bfc3b338ac430a7b234f8c2866 | |
| parent | 391be023560b677b5b51bb4e664619a589d7c9a5 (diff) | |
| download | drakx-96dc12b935f9aea64963b7ea1698eac0b5a74f2f.tar drakx-96dc12b935f9aea64963b7ea1698eac0b5a74f2f.tar.gz drakx-96dc12b935f9aea64963b7ea1698eac0b5a74f2f.tar.bz2 drakx-96dc12b935f9aea64963b7ea1698eac0b5a74f2f.tar.xz drakx-96dc12b935f9aea64963b7ea1698eac0b5a74f2f.zip | |
read & save timeout value (mga#8850)
| -rw-r--r-- | perl-install/NEWS | 1 | ||||
| -rw-r--r-- | perl-install/bootloader.pm | 3 | ||||
| -rw-r--r-- | perl-install/install/NEWS | 1 |
3 files changed, 5 insertions, 0 deletions
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 |