ported fix from v1 to v2 on oracle linux family detection

pull/10806/head
Brian Coca 10 years ago
parent 501f372d75
commit d996a2c216

@ -87,7 +87,7 @@ class Facts(object):
_I386RE = re.compile(r'i([3456]86|86pc)') _I386RE = re.compile(r'i([3456]86|86pc)')
# For the most part, we assume that platform.dist() will tell the truth. # For the most part, we assume that platform.dist() will tell the truth.
# This is the fallback to handle unknowns or exceptions # This is the fallback to handle unknowns or exceptions
OSDIST_LIST = ( ('/etc/oracle-release', 'Oracle Linux'), OSDIST_LIST = ( ('/etc/oracle-release', 'OracleLinux'),
('/etc/redhat-release', 'RedHat'), ('/etc/redhat-release', 'RedHat'),
('/etc/vmware-release', 'VMwareESX'), ('/etc/vmware-release', 'VMwareESX'),
('/etc/openwrt_release', 'OpenWrt'), ('/etc/openwrt_release', 'OpenWrt'),
@ -294,7 +294,7 @@ class Facts(object):
# Once we determine the value is one of these distros # Once we determine the value is one of these distros
# we trust the values are always correct # we trust the values are always correct
break break
elif name == 'Oracle Linux': elif name == 'OracleLinux':
data = get_file_content(path) data = get_file_content(path)
if 'Oracle Linux' in data: if 'Oracle Linux' in data:
self.facts['distribution'] = name self.facts['distribution'] = name

Loading…
Cancel
Save