summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--perl-install/NEWS3
-rw-r--r--perl-install/bootloader.pm3
-rw-r--r--perl-install/install/NEWS3
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)