Fix #4755: add support for GNU/kFreeBSD platform where missing.

Merged manually to the current state of the art.  Minimal conflicts resolved
by adding both Darwin and GNU/KFreeBSD to the confine lines.

Author: Marc Fournier <marc.fournier@camptocamp.com>
Signed-off-by: Daniel Pittman <daniel@puppetlabs.com>
Signed-off-by: Rick Bradley <rick@rickbradley.com>

1 files changed, 3 insertions, 3 deletions

diff --git a/lib/facter/virtual.rb b/lib/facter/virtual.rb
index 8412a0a..47c9504 100644
--- a/lib/facter/virtual.rb
+++ b/lib/facter/virtual.rb
@@ -19,7 +19,7 @@ end
 
 
 Facter.add("virtual") do
-    confine :kernel => %w{Linux FreeBSD OpenBSD SunOS HP-UX}
+    confine :kernel => %w{Linux FreeBSD OpenBSD SunOS HP-UX GNU/kFreeBSD}
 
     result = "physical"
 
@@ -60,7 +60,7 @@ Facter.add("virtual") do
             result = Facter::Util::Virtual.kvm_type()
         end
 
-        if Facter.value(:kernel)=="FreeBSD"
+        if ["FreeBSD", "GNU/kFreeBSD"].include? Facter.value(:kernel)
             result = "jail" if Facter::Util::Virtual.jail?
         end
 
@@ -103,7 +103,7 @@ Facter.add("virtual") do
 end
 
 Facter.add("is_virtual") do
-    confine :kernel => %w{Linux FreeBSD OpenBSD SunOS HP-UX Darwin}
+    confine :kernel => %w{Linux FreeBSD OpenBSD SunOS HP-UX Darwin GNU/kFreeBSD}
 
     setcode do
         if Facter.value(:virtual) != "physical" && Facter.value(:virtual) != "xen0"