fix when the system does not have lsb_release script, but has /etc/lsb_release file
This commit is contained in:
parent
ccad333395
commit
ae9fd2172e
1 changed files with 43 additions and 25 deletions
54
system/setup
54
system/setup
|
@ -376,28 +376,46 @@ class Facts(object):
|
|||
|
||||
def get_lsb_facts(self):
|
||||
lsb_path = module.get_bin_path('lsb_release')
|
||||
if lsb_path is None:
|
||||
return self.facts
|
||||
rc, out, err = module.run_command([lsb_path, "-a"])
|
||||
if rc == 0:
|
||||
if lsb_path:
|
||||
rc, out, err = module.run_command([lsb_path, "-a"])
|
||||
if rc == 0:
|
||||
self.facts['lsb'] = {}
|
||||
for line in out.split('\n'):
|
||||
if len(line) < 1:
|
||||
continue
|
||||
value = line.split(':', 1)[1].strip()
|
||||
if 'LSB Version:' in line:
|
||||
self.facts['lsb']['release'] = value
|
||||
elif 'Distributor ID:' in line:
|
||||
self.facts['lsb']['id'] = value
|
||||
elif 'Description:' in line:
|
||||
self.facts['lsb']['description'] = value
|
||||
elif 'Release:' in line:
|
||||
self.facts['lsb']['release'] = value
|
||||
elif 'Codename:' in line:
|
||||
self.facts['lsb']['codename'] = value
|
||||
if 'lsb' in self.facts and 'release' in self.facts['lsb']:
|
||||
self.facts['lsb']['major_release'] = self.facts['lsb']['release'].split('.')[0]
|
||||
elif lsb_path is None and os.path.exists('/etc/lsb-release'):
|
||||
self.facts['lsb'] = {}
|
||||
for line in out.split('\n'):
|
||||
if len(line) < 1:
|
||||
continue
|
||||
value = line.split(':', 1)[1].strip()
|
||||
if 'LSB Version:' in line:
|
||||
self.facts['lsb']['release'] = value
|
||||
elif 'Distributor ID:' in line:
|
||||
self.facts['lsb']['id'] = value
|
||||
elif 'Description:' in line:
|
||||
self.facts['lsb']['description'] = value
|
||||
elif 'Release:' in line:
|
||||
self.facts['lsb']['release'] = value
|
||||
elif 'Codename:' in line:
|
||||
self.facts['lsb']['codename'] = value
|
||||
with open('/etc/lsb-release', 'r') as f:
|
||||
for line in f.readlines():
|
||||
value = line.split('=',1)[1].strip()
|
||||
if 'DISTRIB_ID' in line:
|
||||
self.facts['lsb']['id'] = value
|
||||
elif 'DISTRIB_RELEASE' in line:
|
||||
self.facts['lsb']['release'] = value
|
||||
elif 'DISTRIB_DESCRIPTION' in line:
|
||||
self.facts['lsb']['description'] = value
|
||||
elif 'DISTRIB_CODENAME' in line:
|
||||
self.facts['lsb']['codename'] = value
|
||||
else:
|
||||
return self.facts
|
||||
|
||||
if 'lsb' in self.facts and 'release' in self.facts['lsb']:
|
||||
self.facts['lsb']['major_release'] = self.facts['lsb']['release'].split('.')[0]
|
||||
|
||||
|
||||
def get_selinux_facts(self):
|
||||
if not HAVE_SELINUX:
|
||||
self.facts['selinux'] = False
|
||||
|
|
Loading…
Reference in a new issue