archive
/
ansible
mirror of https://github.com/ansible/ansible.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Conflicts:

Browse Source 
library/setup
reviewable/pr18780/r1
Ton Kersten 12 years ago committed by Michael DeHaan
parent d6315c0c03
commit 268b09f075
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File

10
setup
Unescape Escape View File

@ -160,7 +160,7 @@ class Facts(object):
# #
'Mandriva' : 'Mandrake', 'Mandriva' : 'Mandrake',
'Mandrake' : 'Mandrake', 'Mandrake' : 'Mandrake',
# #
'Solaris' : 'Solaris', 'Solaris' : 'Solaris',
'Nexenta' : 'Solaris', 'Nexenta' : 'Solaris',
'OmniOS' : 'Solaris', 'OmniOS' : 'Solaris',
@ -168,7 +168,7 @@ class Facts(object):
'SmartOS' : 'Solaris', 'SmartOS' : 'Solaris',
# #
'AIX' : 'AIX' 'AIX' : 'AIX'
} }
if self.facts['system'] == 'AIX': if self.facts['system'] == 'AIX':
self.facts['distribution'] = 'AIX' self.facts['distribution'] = 'AIX'
@ -201,9 +201,9 @@ class Facts(object):
self.facts['distribution'] = name self.facts['distribution'] = name
# Find the family # Find the family
self.facts['osfamily'] = self.facts['distribution'] self.facts['osfamily'] = self.facts['distribution']
if self.facts['distribution'] in OSFAMILY: if self.facts['distribution'] in OSFAMILY:
self.facts['osfamily'] = OSFAMILY[self.facts['distribution']] self.facts['osfamily'] = OSFAMILY[self.facts['distribution']]
def get_cmdline(self): def get_cmdline(self):
data = get_file_content('/proc/cmdline') data = get_file_content('/proc/cmdline')

Write Preview
Loading…
Cancel
Save