diff options
| author | Thierry Vignaud <tv@mandriva.org> | 2010-02-08 15:23:23 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mandriva.org> | 2010-02-08 15:23:23 +0000 |
| commit | 12e92e3f8fac8948897e889fc1f5dcd575e44cd8 (patch) | |
| tree | 09617d603aa1e8dd4a092ed9914f6ee571a61b71 | |
| parent | 151094a01c42a949ed4cead343cd21e4bd892328 (diff) | |
| download | drakx-12e92e3f8fac8948897e889fc1f5dcd575e44cd8.tar drakx-12e92e3f8fac8948897e889fc1f5dcd575e44cd8.tar.gz drakx-12e92e3f8fac8948897e889fc1f5dcd575e44cd8.tar.bz2 drakx-12e92e3f8fac8948897e889fc1f5dcd575e44cd8.tar.xz drakx-12e92e3f8fac8948897e889fc1f5dcd575e44cd8.zip | |
(write_grub) allow timeout to be '0'
| -rw-r--r-- | perl-install/NEWS | 3 | ||||
| -rw-r--r-- | perl-install/bootloader.pm | 3 | ||||
| -rw-r--r-- | perl-install/install/NEWS | 3 |
3 files changed, 8 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS index a0edf7779..a6c300cfa 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,3 +1,6 @@ +- drakboot: + o allow timeout to be '0' + Version 11.71.10 - 17 September 2009 - drakhelp: diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm index f98e04405..fd9f68a08 100644 --- a/perl-install/bootloader.pm +++ b/perl-install/bootloader.pm @@ -1671,7 +1671,8 @@ sub write_grub { { my @conf; - push @conf, map { "$_ $bootloader->{$_}" } grep { $bootloader->{$_} } qw(timeout color password serial shade terminal viewport background foreground); + push @conf, map { "$_ $bootloader->{$_}" } grep { defined $bootloader->{$_} } qw(timeout); + push @conf, map { "$_ $bootloader->{$_}" } grep { $bootloader->{$_} } qw(color password serial shade terminal viewport background foreground); push @conf, map { $_ . ' ' . $file2grub->($bootloader->{$_}) } grep { $bootloader->{$_} } qw(gfxmenu); eval { diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index a6e70aaea..43582b0ae 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,3 +1,6 @@ +- bootloader configuration: + o allow timeout to be '0' + Version 11.71.10 - 17 September 2009 - do allow to upgrade Mandrakelinux (regression introduced in 10.14) |