diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2004-07-19 06:49:29 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2004-07-19 06:49:29 +0000 |
| commit | a8924662d5351a991c9ce8bfce82a027893b0beb (patch) | |
| tree | d7b1cbbd880e9bbe1f334a327f94218845ccf21f | |
| parent | 8c01520a73be2756202052cfac98f5b79ef4d8ae (diff) | |
| download | drakx-backup-do-not-use-a8924662d5351a991c9ce8bfce82a027893b0beb.tar drakx-backup-do-not-use-a8924662d5351a991c9ce8bfce82a027893b0beb.tar.gz drakx-backup-do-not-use-a8924662d5351a991c9ce8bfce82a027893b0beb.tar.bz2 drakx-backup-do-not-use-a8924662d5351a991c9ce8bfce82a027893b0beb.tar.xz drakx-backup-do-not-use-a8924662d5351a991c9ce8bfce82a027893b0beb.zip | |
don't unset prompt when timeout is undefined (and don't care when timeout is 0)
| -rw-r--r-- | perl-install/bootloader.pm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm index 7fd66240b..56da1f487 100644 --- a/perl-install/bootloader.pm +++ b/perl-install/bootloader.pm @@ -828,7 +828,7 @@ sub check_enough_space() { sub write_yaboot { my ($bootloader, $_hds) = @_; - $bootloader->{prompt} = $bootloader->{timeout}; + $bootloader->{prompt} ||= $bootloader->{timeout}; if ($bootloader->{message}) { eval { output("$::prefix/boot/message", $bootloader->{message}) } @@ -917,7 +917,7 @@ sub make_label_lilo_compatible { sub write_lilo { my ($bootloader, $hds) = @_; - $bootloader->{prompt} = $bootloader->{timeout}; + $bootloader->{prompt} ||= $bootloader->{timeout}; my $file2fullname = sub { my ($file) = @_; |