diff options
| author | Jeremy Katz <katzj@redhat.com> | 2003-03-21 00:09:53 +0000 |
|---|---|---|
| committer | Jeremy Katz <katzj@redhat.com> | 2003-03-21 00:09:53 +0000 |
| commit | c29f0955045cdd02965a14300ce5e99364db2d1b (patch) | |
| tree | d84a948b5288d9b0b9bd28649f608b8df9f18ea0 /text.py | |
| parent | 720f69db5a6df4a3d6afe90ea228b5a90fe41333 (diff) | |
| download | anaconda-c29f0955045cdd02965a14300ce5e99364db2d1b.tar.gz anaconda-c29f0955045cdd02965a14300ce5e99364db2d1b.tar.xz anaconda-c29f0955045cdd02965a14300ce5e99364db2d1b.zip | |
merge taroon branch up until now. tagged as before-taroon-merge before and
will be tagged after-taroon-merge after. taroon at this point is tagged
taroon-merge-point for where to base merges from in the future
Diffstat (limited to 'text.py')
| -rw-r--r-- | text.py | 13 |
1 files changed, 3 insertions, 10 deletions
@@ -43,7 +43,6 @@ stepToClasses = { "addswap" : ("upgrade_text", "UpgradeSwapWindow"), "upgrademigratefs" : ("upgrade_text", "UpgradeMigrateFSWindow"), "fdisk" : ("fdisk_text", "fdiskPartitionWindow"), - "fdasd" : ("fdasd_text", "fdasdPartitionWindow"), "partitionmethod" : ("partmethod_text", ("PartitionMethod")), "partition": ("partition_text", ("PartitionWindow")), "findinstall" : ("upgrade_text", ("UpgradeExamineWindow", @@ -55,7 +54,8 @@ stepToClasses = { "BootloaderPasswordWindow")), "bootloaderadvanced" : ("bootloader_text", ("BootloaderImagesWindow", "BootloaderLocationWindow")), - "network" : ("network_text", ("NetworkWindow", "HostnameWindow")), + "network" : ("network_text", ("NetworkDeviceWindow", "NetworkGlobalWindow", + "HostnameWindow")), "firewall" : ("firewall_text", "FirewallWindow"), "languagesupport" : ("language_text", ("LanguageSupportWindow", "LanguageDefaultWindow")), @@ -380,7 +380,7 @@ class InstallInterface: if DEBUG: self.screen.suspendCallback(debugSelf, self.screen) - if flags.serial: + if flags.serial or isys.isPsudoTTY(0): self.screen.suspendCallback(spawnShell, self.screen) # clear out the old root text by writing spaces in the blank @@ -389,13 +389,6 @@ class InstallInterface: #(self.screen.width - len(_(self.welcomeText))) * " ") #self.screen.drawRootText (0 - len(_(step[0])), 0, _(step[0])) lang = id.instLanguage.getCurrent() - # if we don't have any way to display the preselected language, - # fall back to English. - if ((id.instLanguage.getFontFile(lang) == "Kon" and not - isys.isPsudoTTY(0)) or - id.instLanguage.getFontFile(lang) == "None"): - lang = "English" - id.instLanguage.setRuntimeLanguage(lang) lang = id.instLanguage.getLangNick(lang) self.langSearchPath = expandLangs(lang) + ['C'] self.instLanguage = id.instLanguage |