Merge branch 'master' of git@reductivelabs.com:facter

6 files changed, 28 insertions, 7 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 46ef1be..31790c6 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,12 @@
+1.5.2:
+    Fixed #1562 - Removed facter from PREREQS
+
+    Fixed #1558 - Updated virtual fact for xenu and xen0
+
+    Fixed #1555 - Ddded operatingsystemrelease for Solaris
+
+    Fixed #1559 - Update to dmidecode fact
+
 1.5.1:
     Added a Process.waitall thread when there's a timeout, to avoid zombies.
 
diff --git a/install.rb b/install.rb
index 57ba80c..3e0d810 100755
--- a/install.rb
+++ b/install.rb
@@ -59,7 +59,7 @@ rescue
     $haveman = false
 end
 
-PREREQS = %w{openssl facter xmlrpc/client xmlrpc/server cgi}
+PREREQS = %w{openssl xmlrpc/client xmlrpc/server cgi}
 
 InstallOptions = OpenStruct.new
 
diff --git a/lib/facter/ipmess.rb b/lib/facter/ipmess.rb
index ce6e420..badf95f 100644
--- a/lib/facter/ipmess.rb
+++ b/lib/facter/ipmess.rb
@@ -17,7 +17,7 @@ end
 case Facter.value(:kernel) 
  when 'SunOS', 'Linux', 'OpenBSD', 'NetBSD', 'FreeBSD'
   Facter::IPAddress.get_interfaces.each do |interface|
-    mi = interface.gsub(':', '_')
+    mi = interface.gsub('/:|\./', '_')
 
     Facter.add("ipaddress_" + mi) do
         confine :kernel => [ :sunos, :freebsd, :openbsd, :netbsd, :linux ]
diff --git a/lib/facter/operatingsystemrelease.rb b/lib/facter/operatingsystemrelease.rb
index 19d5869..dd8a8cc 100644
--- a/lib/facter/operatingsystemrelease.rb
+++ b/lib/facter/operatingsystemrelease.rb
@@ -74,5 +74,17 @@ Facter.add(:operatingsystemrelease) do
 end
 
 Facter.add(:operatingsystemrelease) do
+    confine :operatingsystem => %w{Solaris}
+    setcode do
+        full_release = File.readlines("/etc/release").to_s.match(/Solaris \w+ [\w\/]+ ([^_]+_[^_]+)/).to_a.last.chomp("wos")
+        if full_release =~ /^s(\d+)\w(_\w\d)+/
+            $1 + $2
+        else
+            full_release
+        end
+    end
+end
+
+Facter.add(:operatingsystemrelease) do
     setcode do Facter[:kernelrelease].value end
 end
diff --git a/lib/facter/util/manufacturer.rb b/lib/facter/util/manufacturer.rb
index 139e668..665fa76 100644
--- a/lib/facter/util/manufacturer.rb
+++ b/lib/facter/util/manufacturer.rb
@@ -22,8 +22,8 @@ module Facter::Manufacturer
 		name.each_pair do |key,v|
 			v.each do |value|
 				output.split("Handle").each do |line|
-					if line =~ /#{key}/  and line =~ /#{value} (\w.*)\n*./
-						result = $1
+				       if line =~ /#{key}/  and line =~ /#{value} ([-\w].*)\n*./
+                                                result = $1
 						Facter.add(value.chomp(':').gsub(' ','')) do
 							confine :kernel => [ :linux, :freebsd, :netbsd, :openbsd ]
 							setcode do
diff --git a/lib/facter/virtual.rb b/lib/facter/virtual.rb
index d84397d..4404ae9 100644
--- a/lib/facter/virtual.rb
+++ b/lib/facter/virtual.rb
@@ -11,12 +11,12 @@ Facter.add("virtual") do
       result = "openvz"
     end
 
-    if FileTest.exists?("/proc/sys/xen/independent_wallclock")
-      result = "xenu"
-    elsif FileTest.exists?("/proc/xen/capabilities")
+    if FileTest.exists?("/proc/xen/capabilities") && FileTest.readable?("/proc/xen/capabilities")
       txt = File.read("/proc/xen/capabilities")
       if txt =~ /control_d/i
         result = "xen0"
+      else
+        result = "xenu" 
       end
     end