Merge remote branch 'adrien/tickets/next/6719' into next

mscherer · Mar 16, 2011 · aa46ede · aa46ede
2 parents 4a718a7 + 1207765
commit aa46ede
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/lib/facter/virtual.rb b/lib/facter/virtual.rb
@@ -25,7 +25,9 @@
 
     setcode do
 
-        result = "zone" if Facter::Util::Virtual.zone?
+        if Facter::Util::Virtual.zone? and Facter(:operatingsystem) == "Solaris"
+            result = "zone"
+        end
 
         if Facter.value(:kernel)=="HP-UX"
             result = "hpvm" if Facter::Util::Virtual.hpvm?