From a5a190c37d15fa8ab0358c75ee3c19eff9eab3af Mon Sep 17 00:00:00 2001 From: Matt Wilson Date: Wed, 22 Sep 1999 06:08:21 +0000 Subject: merge from jj --- text.py | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) (limited to 'text.py') diff --git a/text.py b/text.py index 9b5557549..76ffcfd88 100644 --- a/text.py +++ b/text.py @@ -17,6 +17,9 @@ from textw.constants import * from textw.lilo import LiloWindow from textw.lilo import LiloAppendWindow from textw.lilo import LiloImagesWindow +from textw.silo import SiloWindow +from textw.silo import SiloAppendWindow +from textw.silo import SiloImagesWindow from textw.userauth import RootPasswordWindow from textw.userauth import UsersWindow from textw.userauth import AuthConfigWindow @@ -927,9 +930,24 @@ class InstallInterface: "complete" ] ] - self.upgradeSteps = [ - [_("Examine System"), UpgradeExamineWindow, (self.screen, todo)], - [_("Customize Upgrade"), CustomizeUpgradeWindow, (self.screen, todo, self.individual)], + if iutil.getArch() == 'sparc': + for i in range(len(self.installSteps)): + step = self.installSteps[i] + if step[3] == 'lilo': + self.installSteps[i] = [ + _("SILO Configuration"), SiloAppendWindow, + (self.screen, todo), "silo"] + self.installSteps[i+1] = [ + _("SILO Configuration"), SiloWindow, + (self.screen, todo), "silo"] + self.installSteps[i+2] = [ + _("SILO Configuration"), SiloImagesWindow, + (self.screen, todo), "silo"] + break + + self.upgradeSteps = [ + [_("Examine System"), UpgradeExamineWindow, (self.screen, todo)], + [_("Customize Upgrade"), CustomizeUpgradeWindow, (self.screen, todo, self.individual)], [_("Individual Packages"), IndividualPackageWindow, (self.screen, todo, self.individual)], [_("Upgrade System"), InstallWindow, (self.screen, todo)], [_("Upgrade Complete"), FinishedWindow, (self.screen,)] -- cgit