|
|
|
@ -24,7 +24,7 @@ class fillVars(object, cl_base.glob_attr):
|
|
|
|
|
|
|
|
|
|
def get_os_net_domain(self):
|
|
|
|
|
''' Определим домен'''
|
|
|
|
|
domain=self._runos("%s hostname -d 2>&1"%self.path_env)
|
|
|
|
|
domain=self._runos("hostname -d 2>&1")
|
|
|
|
|
if not domain:
|
|
|
|
|
print _("Error:") + " " +_("Not found domain name")
|
|
|
|
|
print _("Command 'hostname -d' returns an empty value")
|
|
|
|
@ -104,19 +104,20 @@ class fillVars(object, cl_base.glob_attr):
|
|
|
|
|
systemVersion = os.readlink(gentooLink).rpartition("/")[2]
|
|
|
|
|
flagGentoo = True
|
|
|
|
|
if not flagGentoo:
|
|
|
|
|
kernelVersion=self._runos("%s uname -r"%self.path_env)
|
|
|
|
|
kernelVersion=self._runos("uname -r")
|
|
|
|
|
if kernelVersion:
|
|
|
|
|
systemVersion = kernelVersion.partition("-")[0]
|
|
|
|
|
return systemVersion
|
|
|
|
|
|
|
|
|
|
def get_os_net_hostname(self):
|
|
|
|
|
'''Считать имя компьютера net_host'''
|
|
|
|
|
hostname=self._runos("""%s hostname -s 2>&1"""%self.path_env)
|
|
|
|
|
#Set('net_host',hostname, True)
|
|
|
|
|
#упрощенный вариант, следует выполнять только если не указан домен
|
|
|
|
|
#в системе
|
|
|
|
|
hostname=self._runos("hostname -s 2>&1")
|
|
|
|
|
if not hostname:
|
|
|
|
|
return ""
|
|
|
|
|
if re.search("^hostname: ",hostname):
|
|
|
|
|
hostname=self._runos("""%s hostname 2>&1"""%self.path_env)
|
|
|
|
|
hostname=self._runos("hostname 2>&1")
|
|
|
|
|
if not hostname:
|
|
|
|
|
return ""
|
|
|
|
|
if re.search("^hostname: ",hostname):
|
|
|
|
|
return self.Get('os_linux_shortname')
|
|
|
|
|
else:
|
|
|
|
@ -134,8 +135,12 @@ class fillVars(object, cl_base.glob_attr):
|
|
|
|
|
'255.255.255.255':''}
|
|
|
|
|
networks=[]
|
|
|
|
|
netInterfaces=cl_utils.getdirlist("/sys/class/net/")
|
|
|
|
|
flagError = False
|
|
|
|
|
for i in netInterfaces:
|
|
|
|
|
res = self._runos("/sbin/ifconfig %s"%i)
|
|
|
|
|
if not res:
|
|
|
|
|
flagError = True
|
|
|
|
|
break
|
|
|
|
|
for j in res:
|
|
|
|
|
s_ip=re.search('addr:([0-9\.]+).+Bcast:.+Mask:([0-9\.]+)' ,j)
|
|
|
|
|
if s_ip:
|
|
|
|
@ -157,6 +162,8 @@ class fillVars(object, cl_base.glob_attr):
|
|
|
|
|
net[netmask])
|
|
|
|
|
elif netmask=='255.255.0.0':
|
|
|
|
|
networks.append(ip[0]+"."+ip[1]+".0.0"+net[netmask])
|
|
|
|
|
if flagError:
|
|
|
|
|
return ""
|
|
|
|
|
return ",".join(networks)
|
|
|
|
|
|
|
|
|
|
def get_os_locale_locale(self):
|
|
|
|
@ -247,7 +254,9 @@ class fillVars(object, cl_base.glob_attr):
|
|
|
|
|
|
|
|
|
|
def get_os_arch_machine(self):
|
|
|
|
|
"""архитектура процессора"""
|
|
|
|
|
march = self._runos("""%s uname -m"""%self.path_env)
|
|
|
|
|
march = self._runos("uname -m")
|
|
|
|
|
if not march:
|
|
|
|
|
return ""
|
|
|
|
|
return march
|
|
|
|
|
|
|
|
|
|
def get_os_root_dev(self):
|
|
|
|
@ -257,7 +266,9 @@ class fillVars(object, cl_base.glob_attr):
|
|
|
|
|
if re_res:
|
|
|
|
|
return re_res.group(1)
|
|
|
|
|
else:
|
|
|
|
|
mountLunes = self._runos("""%s mount"""%self.path_env)
|
|
|
|
|
mountLunes = self._runos("mount")
|
|
|
|
|
if not mountLunes:
|
|
|
|
|
return ""
|
|
|
|
|
if type(mountLunes) == types.ListType:
|
|
|
|
|
root_dev = mountLunes[0].split("on / type")[0].strip()
|
|
|
|
|
if root_dev:
|
|
|
|
@ -266,7 +277,9 @@ class fillVars(object, cl_base.glob_attr):
|
|
|
|
|
|
|
|
|
|
def get_os_root_type(self):
|
|
|
|
|
"""тип носителя (ram, hdd, livecd)"""
|
|
|
|
|
mountLunes = self._runos("""%s mount"""%self.path_env)
|
|
|
|
|
mountLunes = self._runos("mount")
|
|
|
|
|
if not mountLunes:
|
|
|
|
|
return ""
|
|
|
|
|
rootType = "hdd"
|
|
|
|
|
if type(mountLunes) == types.ListType:
|
|
|
|
|
flagCD = False
|
|
|
|
@ -287,8 +300,10 @@ class fillVars(object, cl_base.glob_attr):
|
|
|
|
|
slpRootDev = rootDev.split("/dev/")
|
|
|
|
|
if len(slpRootDev) == 2:
|
|
|
|
|
rDev = slpRootDev[1]
|
|
|
|
|
devLines = self._runos("%s LANG=C ls -la /dev/disk/by-id/"\
|
|
|
|
|
%self.path_env)
|
|
|
|
|
devLines = self._runos("ls -la /dev/disk/by-id/", None,
|
|
|
|
|
{"LANG":"C"})
|
|
|
|
|
if not devLines:
|
|
|
|
|
return ""
|
|
|
|
|
if type(devLines) == types.ListType:
|
|
|
|
|
for line in devLines:
|
|
|
|
|
if rDev in line and "usb-" in line:
|
|
|
|
@ -302,7 +317,9 @@ class fillVars(object, cl_base.glob_attr):
|
|
|
|
|
|
|
|
|
|
def get_hr_virtual(self):
|
|
|
|
|
"""Название виртуальной машины (virtualbox, vmware, qemu)"""
|
|
|
|
|
pciLines = self._runos("""%s /usr/sbin/lspci"""%self.path_env)
|
|
|
|
|
pciLines = self._runos("/usr/sbin/lspci")
|
|
|
|
|
if not pciLines:
|
|
|
|
|
return False
|
|
|
|
|
virtSysDict = {'VirtualBox':'virtualbox',
|
|
|
|
|
'VMware':'vmware',
|
|
|
|
|
'Qumranet':'qemu'}
|
|
|
|
|