kickstart: use 'bootloader --timeout' even if it is zero.
 

Also write the variable back into the generated anaconda-ks.cfg.

Resolves: rhbz#734094
---
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.
--
1.7.6

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