summaryrefslogtreecommitdiffstats
path: root/textw
diff options
context:
space:
mode:
authorMike Fulbright <msf@redhat.com>2001-08-10 00:31:46 +0000
committerMike Fulbright <msf@redhat.com>2001-08-10 00:31:46 +0000
commitc169fd5d81200929cb45ca15e0153df5a7644112 (patch)
tree8ff60b35aeb69a2c5e9b84318abb00d08e94aa68 /textw
parent6e9d373c87269d1cf259fd8791da59a7a5dd7d31 (diff)
downloadanaconda-c169fd5d81200929cb45ca15e0153df5a7644112.tar.gz
anaconda-c169fd5d81200929cb45ca15e0153df5a7644112.tar.xz
anaconda-c169fd5d81200929cb45ca15e0153df5a7644112.zip
handle video cards which probe ok, but for some reason the native X server doesnt work, and we fallback to VGA. Need to remember to configure the probed card later (and hope it works?). Fixed bug # 51273
Diffstat (limited to 'textw')
-rw-r--r--textw/xconfig_text.py12
1 files changed, 10 insertions, 2 deletions
diff --git a/textw/xconfig_text.py b/textw/xconfig_text.py
index dda474284..4f88b8002 100644
--- a/textw/xconfig_text.py
+++ b/textw/xconfig_text.py
@@ -12,6 +12,7 @@
#
from monitor import isValidSyncRange
+from videocard import Videocard_blacklist
from constants_text import *
from snack import *
from translate import _
@@ -111,7 +112,6 @@ class XCustomWindow:
for i in availableDepths:
self.available_depths.append(depth_list[self.bit_depth.index(i)])
manualmodes = self.xconfig.getManualModes()
-
if manualmodes:
self.selectedDepth = manualmodes.keys()[0]
self.selectedRes = manualmodes[self.selectedDepth][0]
@@ -119,6 +119,10 @@ class XCustomWindow:
self.selectedDepth = None
self.selectedRes = None
+ # if selected depth not acceptable then force it to be at least 8bpp
+ if self.selectedDepth and int(self.selectedDepth) < 8:
+ self.selectedDepth = "8"
+
if not self.selectedDepth or not self.selectedRes:
if len(self.available_res_by_depth) == 1:
self.available_res = self.available_res_by_depth["8"]
@@ -419,7 +423,6 @@ class MonitorWindow:
_("You cannot go back from this "
"step."),
buttons = [ TEXT_OK_BUTTON ])
- continue
elif rc == TEXT_OK_CHECK or result == TEXT_F12_CHECK:
screen.popWindow()
break
@@ -520,6 +523,11 @@ class XConfigWindowCard:
self.cards = self.videocard.cardsDB()
self.cardslist = self.cards.keys()
self.cardslist.sort()
+ for card in Videocard_blacklist:
+ try:
+ self.cardslist.remove(card)
+ except:
+ pass
self.ramlist = []
for ram in self.videocard.possible_ram_sizes():