diff options
author | Rein Henrichs <rein@puppetlabs.com> | 2010-08-06 14:34:35 -0700 |
---|---|---|
committer | Rein Henrichs <rein@puppetlabs.com> | 2010-08-06 14:34:35 -0700 |
commit | bd3af7e4ba4c20cb079237ca7c4f347d7465ac4f (patch) | |
tree | 0a241d8f6426b05847c92f742b5ab0da5cac2ccd /lib/facter/virtual.rb | |
parent | 881249f967eb6d7f513b3bd502dcda29f4007510 (diff) | |
parent | faaa169d73e5132b7f2ea491461690324c1133ab (diff) | |
download | facter-bd3af7e4ba4c20cb079237ca7c4f347d7465ac4f.tar.gz facter-bd3af7e4ba4c20cb079237ca7c4f347d7465ac4f.tar.xz facter-bd3af7e4ba4c20cb079237ca7c4f347d7465ac4f.zip |
Merge remote branch 'kubicek/ticket/master/4352'
Diffstat (limited to 'lib/facter/virtual.rb')
-rw-r--r-- | lib/facter/virtual.rb | 6 |
1 files changed, 5 insertions, 1 deletions
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 |