|
|
@ -50,6 +50,47 @@ class fillVars(object, cl_base.glob_attr):
|
|
|
|
return shortNameList[0]
|
|
|
|
return shortNameList[0]
|
|
|
|
return "CLD"
|
|
|
|
return "CLD"
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def get_os_linux_name(self):
|
|
|
|
|
|
|
|
"""полное название системы"""
|
|
|
|
|
|
|
|
linuxShortName = self.Get("os_linux_shortname")
|
|
|
|
|
|
|
|
if linuxShortName:
|
|
|
|
|
|
|
|
dictLinuxName = {"CLD":"Calculate Linux Desktop",
|
|
|
|
|
|
|
|
"CLDX":"Calculate Linux Desktop",
|
|
|
|
|
|
|
|
"CDS":"Calculate Directory Server"}
|
|
|
|
|
|
|
|
if linuxShortName in dictLinuxName.keys():
|
|
|
|
|
|
|
|
return dictLinuxName[linuxShortName]
|
|
|
|
|
|
|
|
else:
|
|
|
|
|
|
|
|
return ""
|
|
|
|
|
|
|
|
else:
|
|
|
|
|
|
|
|
return ""
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def get_os_linux_subname(self):
|
|
|
|
|
|
|
|
"""постфикс к названию системы"""
|
|
|
|
|
|
|
|
linuxShortName = self.Get("os_linux_shortname")
|
|
|
|
|
|
|
|
if linuxShortName:
|
|
|
|
|
|
|
|
dictLinuxSubName = {"CLD":"KDE", "CLDX":"XFCE"}
|
|
|
|
|
|
|
|
if linuxShortName in dictLinuxSubName.keys():
|
|
|
|
|
|
|
|
return dictLinuxSubName[linuxShortName]
|
|
|
|
|
|
|
|
else:
|
|
|
|
|
|
|
|
return ""
|
|
|
|
|
|
|
|
else:
|
|
|
|
|
|
|
|
return ""
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def get_os_linux_ver(self):
|
|
|
|
|
|
|
|
'''Получить версию системы'''
|
|
|
|
|
|
|
|
path = '/etc/calculate/calculate.ini'
|
|
|
|
|
|
|
|
if os.path.exists(path):
|
|
|
|
|
|
|
|
FD = open(path)
|
|
|
|
|
|
|
|
data = FD.readlines()
|
|
|
|
|
|
|
|
FD.close()
|
|
|
|
|
|
|
|
shortNameList = filter(lambda y:y,
|
|
|
|
|
|
|
|
map(lambda x:\
|
|
|
|
|
|
|
|
len(x.split("="))==2 and\
|
|
|
|
|
|
|
|
x.split("=")[0]=="linuxver" and\
|
|
|
|
|
|
|
|
x.split("=")[1].strip(), data))
|
|
|
|
|
|
|
|
if shortNameList:
|
|
|
|
|
|
|
|
return shortNameList[0]
|
|
|
|
|
|
|
|
return ""
|
|
|
|
|
|
|
|
|
|
|
|
def get_os_net_hostname(self):
|
|
|
|
def get_os_net_hostname(self):
|
|
|
|
'''Считать имя компьютера net_host'''
|
|
|
|
'''Считать имя компьютера net_host'''
|
|
|
|