From b3117f6040885a77c19556fd06047d31b98270d2 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Wed, 3 Feb 2010 23:38:10 +0000 Subject: (write_grub) allow timeout to be '0' --- 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 aac16d1ed..5eb8c0231 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,5 +1,6 @@ - drakboot: o always display security settings + o allow timeout to be '0' Version 13.5 - 26 January 2010 diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm index 266df5ebd..07a770f49 100644 --- a/perl-install/bootloader.pm +++ b/perl-install/bootloader.pm @@ -1711,7 +1711,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 26740e0c9..31679356c 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,5 +1,6 @@ - bootloader configuration: o always display security settings + o allow timeout to be '0' Version 13.8 - 3 February 2010 -- cgit v1.2.1