|
|
@ -23,10 +23,10 @@ from cl_datavars import glob_attr
|
|
|
|
from os import path
|
|
|
|
from os import path
|
|
|
|
from os import readlink,access,R_OK
|
|
|
|
from os import readlink,access,R_OK
|
|
|
|
from cl_utils import isMount,typeFile,getTupleVersion,pathJoin,isFstabMount,\
|
|
|
|
from cl_utils import isMount,typeFile,getTupleVersion,pathJoin,isFstabMount,\
|
|
|
|
listDirectory, getAvailableX11Drivers, getUUIDDict, \
|
|
|
|
listDirectory, getAvailableVideo, getUUIDDict, \
|
|
|
|
getUdevDeviceInfo, getPartitionDevice, getPartitionSize, \
|
|
|
|
getUdevDeviceInfo, getPartitionDevice, getPartitionSize, \
|
|
|
|
FStab, isPkgInstalled, process, checkUtils, \
|
|
|
|
isPkgInstalled, process, checkUtils, readLinesFile, \
|
|
|
|
readLinesFile, lspci
|
|
|
|
FStab, lspci, getInstalledVideo
|
|
|
|
from cl_distr import DistributiveRepository,PartitionDistributive
|
|
|
|
from cl_distr import DistributiveRepository,PartitionDistributive
|
|
|
|
from cl_fill import clLocale
|
|
|
|
from cl_fill import clLocale
|
|
|
|
from operator import itemgetter
|
|
|
|
from operator import itemgetter
|
|
|
@ -623,7 +623,7 @@ class fillVars(object, glob_attr):
|
|
|
|
"""Kernel attributes"""
|
|
|
|
"""Kernel attributes"""
|
|
|
|
# on usb-hdd install must be "delay=5"
|
|
|
|
# on usb-hdd install must be "delay=5"
|
|
|
|
if self.Get('os_install_root_type') == 'usb-hdd':
|
|
|
|
if self.Get('os_install_root_type') == 'usb-hdd':
|
|
|
|
return "delay=5"
|
|
|
|
return " scandelay=5"
|
|
|
|
else:
|
|
|
|
else:
|
|
|
|
return ""
|
|
|
|
return ""
|
|
|
|
|
|
|
|
|
|
|
@ -841,15 +841,14 @@ class fillVars(object, glob_attr):
|
|
|
|
def get_os_install_x11_video_drv(self):
|
|
|
|
def get_os_install_x11_video_drv(self):
|
|
|
|
"""Video driver used by xorg"""
|
|
|
|
"""Video driver used by xorg"""
|
|
|
|
if self.Get('os_install_root_type') == 'usb-hdd':
|
|
|
|
if self.Get('os_install_root_type') == 'usb-hdd':
|
|
|
|
available_drivers = \
|
|
|
|
prefix = self.Get('cl_chroot_path')
|
|
|
|
getAvailableX11Drivers(prefix=self.Get('cl_chroot_path'))
|
|
|
|
|
|
|
|
videoVal = self.getValueFromCmdLine("calculate","video")
|
|
|
|
videoVal = self.getValueFromCmdLine("calculate","video")
|
|
|
|
videoVal = {'i915':'intel'}.get(videoVal,videoVal)
|
|
|
|
videoVal = {'i915':'intel'}.get(videoVal,videoVal)
|
|
|
|
if not isPkgInstalled('xorg-server',
|
|
|
|
if not isPkgInstalled('xorg-server',
|
|
|
|
prefix=self.Get('cl_chroot_path')) or \
|
|
|
|
prefix=self.Get('cl_chroot_path')) or \
|
|
|
|
videoVal in available_drivers:
|
|
|
|
videoVal in getAvailableVideo(prefix=prefix):
|
|
|
|
return videoVal
|
|
|
|
return videoVal
|
|
|
|
return self.getVideoByDefault(available_drivers)
|
|
|
|
return self.getVideoByDefault(getInstalledVideo(prefix=prefix))
|
|
|
|
else:
|
|
|
|
else:
|
|
|
|
return self.Get('os_x11_video_drv')
|
|
|
|
return self.Get('os_x11_video_drv')
|
|
|
|
|
|
|
|
|
|
|
|