Use first line from /etc/release in "distribution_release" for consistency across Solaris and derivatives.

12 years ago · 2ba47318dc
parent f0a4a17ff6
commit 2ba47318dc
1 changed files with 4 additions and 4 deletions
--- a/library/system/setup
+++ b/library/system/setup
@ -238,13 +238,13 @@ class Facts(object):
                        self.facts['distribution_version'] = data
                    elif name == 'Solaris':
                        data = get_file_content(path).split('\n')[0]
+                        ora_prefix = ''
                        if 'Oracle Solaris' in data:
-                           data = " ".join(data.split()[1:None])
+                            data = data.replace('Oracle ','')
+                            ora_prefix = 'Oracle '
                        self.facts['distribution'] = data.split()[0]
                        self.facts['distribution_version'] = data.split()[1]
-                        distribution_release = " ".join(data.split()[2:None])
-                        if distribution_release != 'X86' and distribution_release != 'SPARC':
-                            self.facts['distribution_release'] = distribution_release
+                        self.facts['distribution_release'] = ora_prefix + data
                    else:
                        self.facts['distribution'] = name