diff options
| author | Peter Jones <pjones@redhat.com> | 2009-11-23 13:47:41 -0500 |
|---|---|---|
| committer | Peter Jones <pjones@redhat.com> | 2009-11-23 14:07:07 -0500 |
| commit | 8c24c48663851eedc2a2328641f9fdea8fcee94a (patch) | |
| tree | 1942e6fbebdb5d2b4eade185eaab7214bcb85c2b | |
| parent | 884dbbf630dcfdd6f4466d249666f55d7a1e9670 (diff) | |
| download | anaconda-8c24c48663851eedc2a2328641f9fdea8fcee94a.tar.gz anaconda-8c24c48663851eedc2a2328641f9fdea8fcee94a.tar.xz anaconda-8c24c48663851eedc2a2328641f9fdea8fcee94a.zip | |
Use installclass to make the bootloader timeout 5 seconds on RHEL.
In RHEL, we want the old bootloader timeout behavior, so people see
output on the teletype and have time to frob some switches on the
front panel. But for those of us in modern environments, we don't want
to do that, so this patch uses installclass to choose which one you get.
| -rw-r--r-- | installclass.py | 6 | ||||
| -rw-r--r-- | installclasses/rhel.py | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/installclass.py b/installclass.py index 1e1d9b86d..03902c835 100644 --- a/installclass.py +++ b/installclass.py @@ -55,6 +55,7 @@ class BaseInstallClass(object): pkgstext = "" # default to showing the upgrade option showUpgrade = True + bootloaderTimeoutDefault = 0 bugFiler = AbstractFiler(product.bugUrl, product.bugUrl, product.productVersion, product.productName) @@ -195,8 +196,9 @@ class BaseInstallClass(object): def setInstallData(self, anaconda): - anaconda.id.reset() - anaconda.id.instClass = self + anaconda.id.reset() + anaconda.id.instClass = self + anaconda.id.bootloader.timeout = self.bootloaderTimeoutDefault def versionMatches(self, oldver): pass diff --git a/installclasses/rhel.py b/installclasses/rhel.py index e883b89e7..ec566c06b 100644 --- a/installclasses/rhel.py +++ b/installclasses/rhel.py @@ -46,6 +46,8 @@ class InstallClass(BaseInstallClass): if not productName.startswith("Red Hat Enterprise"): hidden = 1 + bootloaderTimeoutDefault = 5 + tasks = [(N_("Minimal"), ["core"]), (N_("Desktop"), ["backup-client", "base", "compat-libraries", "console-internet", |