lib/facter/operatingsystem.rb in facter-1.5.8 vs lib/facter/operatingsystem.rb in facter-1.5.9

@@ -30,14 +30,18 @@
             else
                 "OEL"
             end
         elsif FileTest.exists?("/etc/arch-release")
             "Arch"
+        elsif FileTest.exists?("/etc/vmware-release")
+            "VMWareESX"
         elsif FileTest.exists?("/etc/redhat-release")
             txt = File.read("/etc/redhat-release")
             if txt =~ /centos/i
                 "CentOS"
+            elsif txt =~ /scientific/i 
+                "Scientific"
             else
                 "RedHat"
             end
         elsif FileTest.exists?("/etc/SuSE-release")
             txt = File.read("/etc/SuSE-release")
@@ -48,12 +52,23 @@
             elsif txt =~ /^openSUSE/i
                 "OpenSuSE"
             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
+
+Facter.add(:operatingsystem) do
+    confine :kernel => "VMkernel"
+    setcode do
+        "ESXi"
     end
 end
 
 Facter.add(:operatingsystem) do
     # Default to just returning the kernel as the operating system