diff options
| author | Ales Kozumplik <akozumpl@redhat.com> | 2011-08-30 13:22:37 +0200 |
|---|---|---|
| committer | Ales Kozumplik <akozumpl@redhat.com> | 2011-08-30 16:30:06 +0200 |
| commit | c12838c170040e035864e079de45c544dd7d8e7a (patch) | |
| tree | c16f5d784f7bfa70cf57e1d1ab1e64b76fca5b0e | |
| parent | ce5cf8573be0a4f4c1c7b16bb4c644bee3f6e92b (diff) | |
| download | anaconda-c12838c170040e035864e079de45c544dd7d8e7a.tar.gz anaconda-c12838c170040e035864e079de45c544dd7d8e7a.tar.xz anaconda-c12838c170040e035864e079de45c544dd7d8e7a.zip | |
kickstart: use 'bootloader --timeout' even if it is zero.
Also write the variable back into the generated anaconda-ks.cfg.
Resolves: rhbz#734094
| -rw-r--r-- | pyanaconda/bootloader.py | 2 | ||||
| -rw-r--r-- | pyanaconda/kickstart.py | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/pyanaconda/bootloader.py b/pyanaconda/bootloader.py index 670961760..94805fadd 100644 --- a/pyanaconda/bootloader.py +++ b/pyanaconda/bootloader.py @@ -950,6 +950,8 @@ class BootLoader(object): location = "none\n" 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 548a73c83..cff041fa8 100644 --- a/pyanaconda/kickstart.py +++ b/pyanaconda/kickstart.py @@ -287,7 +287,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. |