Merge remote branch 'kubicek/ticket/master/4352'

2 files changed, 13 insertions, 5 deletions

diff --git a/lib/facter/util/virtual.rb b/lib/facter/util/virtual.rb
index 80f4e2c..2d18c33 100644
--- a/lib/facter/util/virtual.rb
+++ b/lib/facter/util/virtual.rb
@@ -43,11 +43,12 @@ module Facter::Util::Virtual
     end
 
     def self.kvm?
-       if FileTest.exists?("/proc/cpuinfo")
-           txt = File.read("/proc/cpuinfo")
-           return true if txt =~ /QEMU Virtual CPU/
+       txt = if FileTest.exists?("/proc/cpuinfo")
+           File.read("/proc/cpuinfo")
+       elsif Facter.value(:kernel)=="FreeBSD"
+           Facter::Util::Resolution.exec("/sbin/sysctl -n hw.model")
        end
-       return false
+       (txt =~ /QEMU Virtual CPU/) ? true : false
     end
 
     def self.kvm_type
@@ -57,5 +58,8 @@ module Facter::Util::Virtual
       "kvm"
     end
 
+    def self.jail?
+        Facter::Util::Resolution.exec("/sbin/sysctl -n security.jail.jailed") == "1"
+    end
 
 end
diff --git a/lib/facter/virtual.rb b/lib/facter/virtual.rb
index c6d0f22..c14a715 100644
--- a/lib/facter/virtual.rb
+++ b/lib/facter/virtual.rb
@@ -38,6 +38,10 @@ Facter.add("virtual") do
             result = Facter::Util::Virtual.kvm_type()
         end
 
+        if Facter.value(:kernel)=="FreeBSD"
+            result = "jail" if Facter::Util::Virtual.jail?
+        end
+
         if result == "physical"
             output = Facter::Util::Resolution.exec('lspci')
             if not output.nil?
@@ -76,7 +80,7 @@ Facter.add("is_virtual") do
 
     setcode do
         case Facter.value(:virtual)
-        when "xenu", "openvzve", "vmware", "kvm", "vserver"
+        when "xenu", "openvzve", "vmware", "kvm", "vserver", "jail"
             true
         else 
             false