FAQ Search Today's Posts Mark Forums Read
» Video Reviews

» Linux Archive

Linux-archive is a website aiming to archive linux email lists and to make them easily accessible for linux users/developers.


» Sponsor

» Partners

» Sponsor

Go Back   Linux Archive > Debian > Debian User

 
 
LinkBack Thread Tools
 
Old 08-30-2011, 01:58 PM
David Lehman
 
Default kickstart: use 'bootloader --timeout' even if it is zero.

On Tue, 2011-08-30 at 15:44 +0200, Ales Kozumplik wrote:
> Also write the variable back into the generated anaconda-ks.cfg.
>
> Resolves: rhbz#734094

Ack.

> ---
> pyanaconda/bootloader.py | 2 ++
> pyanaconda/kickstart.py | 2 +-
> 2 files changed, 3 insertions(+), 1 deletions(-)
>
> diff --git a/pyanaconda/bootloader.py b/pyanaconda/bootloader.py
> index be49a75..e6ac11d 100644
> --- a/pyanaconda/bootloader.py
> +++ b/pyanaconda/bootloader.py
> @@ -950,6 +950,8 @@ class BootLoader(object):
> location = "none
"
>
> f.write("bootloader --location=%s" % location)
> + if self.timeout is not None:
> + f.write(" --timeout=%d" % self.timeout)
>
> if not self.stage1_device:
> return
> diff --git a/pyanaconda/kickstart.py b/pyanaconda/kickstart.py
> index 2e82ea7..ddf74ae 100644
> --- a/pyanaconda/kickstart.py
> +++ b/pyanaconda/kickstart.py
> @@ -288,7 +288,7 @@ class Bootloader(commands.bootloader.F15_Bootloader):
> if location != None:
> self.anaconda.bootloader.set_preferred_stage1_type (location)
>
> - if self.timeout:
> + if self.timeout is not None:
> self.anaconda.bootloader.timeout = self.timeout
>
> # Throw out drives specified that don't exist.


_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@redhat.com
https://www.redhat.com/mailman/listinfo/anaconda-devel-list
 

Thread Tools




All times are GMT. The time now is 07:21 PM.

VBulletin, Copyright ©2000 - 2014, Jelsoft Enterprises Ltd.
Content Relevant URLs by vBSEO ©2007, Crawlability, Inc.
Copyright 2007 - 2008, www.linux-archive.org