|
|
|
@ -29,7 +29,7 @@ from cl_utils import isMount,typeFile,getTupleVersion,pathJoin,isFstabMount,\
|
|
|
|
|
FStab, lspci, getInstalledVideo,getDeviceType, \
|
|
|
|
|
getPartitionType, getOsProberHash, getProgPath, \
|
|
|
|
|
getRaidPartitions, getLvmPartitions, getLvmGroups, \
|
|
|
|
|
getPasswdUsers
|
|
|
|
|
getPasswdUsers, readFile
|
|
|
|
|
from cl_distr import DistributiveRepository,PartitionDistributive
|
|
|
|
|
from cl_fill import clLocale
|
|
|
|
|
from operator import itemgetter
|
|
|
|
@ -732,7 +732,7 @@ class fillVars(object, glob_attr):
|
|
|
|
|
root_dev = filter(lambda x: x in root_dev,
|
|
|
|
|
self.Get('os_device_dev'))
|
|
|
|
|
if root_dev:
|
|
|
|
|
root_dev = root_dev[0]
|
|
|
|
|
root_dev = root_dev[0].rpartition('/')[2]
|
|
|
|
|
pathScheduler = '/sys/block/%s/queue/scheduler'%root_dev
|
|
|
|
|
if access(pathScheduler,R_OK):
|
|
|
|
|
res = re.search("\[([^\]]+)\]",
|
|
|
|
@ -741,6 +741,17 @@ class fillVars(object, glob_attr):
|
|
|
|
|
return res.groups()[0]
|
|
|
|
|
return "cfq"
|
|
|
|
|
|
|
|
|
|
def get_os_kernel_schedulers(self):
|
|
|
|
|
|
|
|
|
|
"""Get scheduler for install root device"""
|
|
|
|
|
root_dev = self.Get('os_device_dev')
|
|
|
|
|
if root_dev:
|
|
|
|
|
root_dev = root_dev[0].rpartition('/')[2]
|
|
|
|
|
pathScheduler = '/sys/block/%s/queue/scheduler'%root_dev
|
|
|
|
|
return map(lambda x:x.strip("[]"),
|
|
|
|
|
readFile(pathScheduler).strip().split())
|
|
|
|
|
return []
|
|
|
|
|
|
|
|
|
|
def get_os_install_lvm_set(self):
|
|
|
|
|
"""Using lvm"""
|
|
|
|
|
lvm = filter(lambda x:x[1] != '' and "lvm" in x[0],
|
|
|
|
|