|
|
|
@ -869,19 +869,11 @@ class fillVars(object, glob_attr):
|
|
|
|
|
map(lambda x: x[:-7],
|
|
|
|
|
filter(lambda x: x.endswith('_drv.so'),
|
|
|
|
|
listDirectory(xorg_modules_dir)))
|
|
|
|
|
defaultDriver = {
|
|
|
|
|
'vesa':'vesa',
|
|
|
|
|
'nvidia':'nvidia' if "nvidia" in avialable_drivers else "nv",
|
|
|
|
|
'ati':'fglrx' if "fglrx" in avialable_drivers else "radeon",
|
|
|
|
|
'intel':'intel',
|
|
|
|
|
'via':'via',
|
|
|
|
|
'vmware':'vmware'}
|
|
|
|
|
hr_video = self.Get('hr_video')
|
|
|
|
|
if hr_video in defaultDriver and \
|
|
|
|
|
defaultDriver[hr_video] in avialable_drivers:
|
|
|
|
|
return defaultDriver[hr_video]
|
|
|
|
|
else:
|
|
|
|
|
return "vesa"
|
|
|
|
|
videoVal = self.getValueFromCmdLine("calculate","video")
|
|
|
|
|
videoVal = {'i915':'intel'}.get(videoVal,videoVal)
|
|
|
|
|
if videoVal in list_avialable_drivers:
|
|
|
|
|
return videoVal
|
|
|
|
|
return self.getVideoByDefault(list_avialable_drivers)
|
|
|
|
|
else:
|
|
|
|
|
return self.Get('os_x11_video_drv')
|
|
|
|
|
|
|
|
|
|