|
|
|
@ -613,32 +613,12 @@ class fillVars(object, glob_attr):
|
|
|
|
|
def get_os_install_linux_subname(self):
|
|
|
|
|
"""Subname of installation os"""
|
|
|
|
|
linuxShortName = self.Get("os_install_linux_shortname")
|
|
|
|
|
if linuxShortName:
|
|
|
|
|
dictLinuxSubName = {"CLD":"KDE", "CLDX":"XFCE", "CLDG":"GNOME"}
|
|
|
|
|
if linuxShortName in dictLinuxSubName.keys():
|
|
|
|
|
return dictLinuxSubName[linuxShortName]
|
|
|
|
|
else:
|
|
|
|
|
return ""
|
|
|
|
|
else:
|
|
|
|
|
return ""
|
|
|
|
|
return self.dictLinuxSubName.get(linuxShortName,"")
|
|
|
|
|
|
|
|
|
|
def get_os_install_linux_name(self):
|
|
|
|
|
"""Name of installation os"""
|
|
|
|
|
linuxShortName = self.Get("os_install_linux_shortname")
|
|
|
|
|
if linuxShortName:
|
|
|
|
|
dictLinuxName = {"CLD":"Calculate Linux Desktop",
|
|
|
|
|
"CLDX":"Calculate Linux Desktop",
|
|
|
|
|
"CLDG":"Calculate Linux Desktop",
|
|
|
|
|
"CDS":"Calculate Directory Server",
|
|
|
|
|
"CLS":"Calculate Linux Scratch",
|
|
|
|
|
"CSS":"Calculate Scratch Server",
|
|
|
|
|
"Gentoo":"Gentoo"}
|
|
|
|
|
if linuxShortName in dictLinuxName.keys():
|
|
|
|
|
return dictLinuxName[linuxShortName]
|
|
|
|
|
else:
|
|
|
|
|
return "Linux"
|
|
|
|
|
else:
|
|
|
|
|
return "Linux"
|
|
|
|
|
return self.dictLinuxName.get(linuxShortName,"Linux")
|
|
|
|
|
|
|
|
|
|
def get_os_bind_hash(self):
|
|
|
|
|
"""List mounted points for current operation system"""
|
|
|
|
|