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. --- installclass.py | 6 ++++-- installclasses/rhel.py | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/installclass.py b/installclass.py index 1e1d9b8..03902c8 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 e883b89..ec566c0 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", -- 1.6.5.2 _______________________________________________ Anaconda-devel-list mailing list Anaconda-devel-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/anaconda-devel-list