Merge remote branch 'stschulte/feature/master/5040' into next

Manually resolved conflicts:
	lib/facter/virtual.rb
	spec/unit/virtual.rb

1 files changed, 7 insertions, 3 deletions

diff --git a/lib/facter/virtual.rb b/lib/facter/virtual.rb
index 242422c..a8afb60 100644
--- a/lib/facter/virtual.rb
+++ b/lib/facter/virtual.rb
@@ -1,7 +1,7 @@
 require 'facter/util/virtual'
 
 Facter.add("virtual") do
-    confine :kernel => %w{Linux FreeBSD OpenBSD SunOS}
+    confine :kernel => %w{Linux FreeBSD OpenBSD SunOS HP-UX}
 
     result = "physical"
 
@@ -9,6 +9,10 @@ Facter.add("virtual") do
 
         result = "zone" if Facter::Util::Virtual.zone?
 
+        if Facter.value(:kernel)=="HP-UX"
+            result = "hpvm" if Facter::Util::Virtual.hpvm?
+        end
+
         if Facter::Util::Virtual.openvz?
             result = Facter::Util::Virtual.openvz_type()
         end
@@ -76,11 +80,11 @@ Facter.add("virtual") do
 end
   
 Facter.add("is_virtual") do
-    confine :kernel => %w{Linux FreeBSD OpenBSD SunOS}
+    confine :kernel => %w{Linux FreeBSD OpenBSD SunOS HP-UX}
 
     setcode do
         case Facter.value(:virtual)
-        when "xenu", "openvzve", "vmware", "kvm", "vserver", "jail", "zone"
+        when "xenu", "openvzve", "vmware", "kvm", "vserver", "jail", "zone", "hpvm"
             "true"
         else 
             "false"