Merge remote branch 'adrien/tickets/next/2721' into next

mscherer · Mar 16, 2011 · 1390100 · 1390100
2 parents 6f0757d + edb9760
commit 1390100
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 3 deletions.
diff --git a/lib/facter/operatingsystem.rb b/lib/facter/operatingsystem.rb
@@ -52,8 +52,12 @@
             else
                 "SuSE"
             end
-	elsif FileTest.exists?("/etc/slackware-version")
-	    "Slackware"
+        elsif FileTest.exists?("/etc/bluewhite64-version")
+            "Bluewhite64"
+        elsif FileTest.exists?("/etc/slamd64-version")
+            "Slamd64"
+        elsif FileTest.exists?("/etc/slackware-version")
+            "Slackware"
         end
     end
 end

diff --git a/lib/facter/operatingsystemrelease.rb b/lib/facter/operatingsystemrelease.rb
@@ -72,5 +72,29 @@
 end
 
 Facter.add(:operatingsystemrelease) do
-    setcode do Facter[:kernelrelease].value end
+    confine :operatingsystem => %w{Bluewhite64}
+    setcode do
+        releasefile = Facter::Util::Resolution.exec('cat /etc/bluewhite64-version')
+        if releasefile =~ /^\s*\w+\s+(\d+)\.(\d+)/
+            $1 + "." + $2
+        else
+            "unknown"
+        end
+    end
+end
+
+Facter.add(:operatingsystemrelease) do
+    confine :operatingsystem => %w{Slamd64}
+    setcode do
+        releasefile = Facter::Util::Resolution.exec('cat /etc/slamd64-version')
+        if releasefile =~ /^\s*\w+\s+(\d+)\.(\d+)/
+            $1 + "." + $2
+        else
+            "unknown"
+        end
+    end
+end
+
+Facter.add(:operatingsystemrelease) do
+  setcode do Facter[:kernelrelease].value end
 end