|
|
|
@ -1558,14 +1558,16 @@ class cl_install(color_print):
|
|
|
|
|
self.clVars.Get('hr_video'))
|
|
|
|
|
open(nvidiaMaskFile,'w').write(maskNvidia)
|
|
|
|
|
try:
|
|
|
|
|
envDict = {'PKGDIR':binPackages}
|
|
|
|
|
envDict.update(os.environ)
|
|
|
|
|
processEmerge = process('/usr/bin/emerge','-k','nvidia-drivers',
|
|
|
|
|
envdict={'PKGDIR':binPackages},stdout=PIPE,stderr=PIPE)
|
|
|
|
|
envdict=envDict,stdout=PIPE,stderr=PIPE)
|
|
|
|
|
res = processEmerge.success()
|
|
|
|
|
except KeyboardInterrupt:
|
|
|
|
|
os.unlink(nvidiaMaskFile)
|
|
|
|
|
return False
|
|
|
|
|
if not res:
|
|
|
|
|
os.unlink(maskFile)
|
|
|
|
|
os.unlink(nvidiaMaskFile)
|
|
|
|
|
return res
|
|
|
|
|
|
|
|
|
|
def configureSystem(self):
|
|
|
|
@ -1612,12 +1614,12 @@ class cl_install(color_print):
|
|
|
|
|
|
|
|
|
|
pathGlModules = path.join(self.clVars.Get('cl_chroot_path'),
|
|
|
|
|
'usr/lib/opengl')
|
|
|
|
|
if path.exists(pathGlModules):
|
|
|
|
|
self.printMessageForTest(_("Configure OpenGL"))
|
|
|
|
|
self.printByResult(self.setupOpenGL())
|
|
|
|
|
if self.clVars.Get('os_root_type') != "livecd":
|
|
|
|
|
self.printMessageForTest(_("Check the video driver"))
|
|
|
|
|
self.printByResult(self.checkVideoDriver())
|
|
|
|
|
if path.exists(pathGlModules):
|
|
|
|
|
self.printMessageForTest(_("Configure OpenGL"))
|
|
|
|
|
self.printByResult(self.setupOpenGL())
|
|
|
|
|
|
|
|
|
|
except (InstallError,DistributiveError),e:
|
|
|
|
|
error = e
|
|
|
|
|