diff options
-rw-r--r-- | lib/ohai/plugins/darwin/virtualization.rb | 5 | ||||
-rw-r--r-- | spec/unit/plugins/darwin/virtualization_spec.rb | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/lib/ohai/plugins/darwin/virtualization.rb b/lib/ohai/plugins/darwin/virtualization.rb index d25f646b..4ccdc19d 100644 --- a/lib/ohai/plugins/darwin/virtualization.rb +++ b/lib/ohai/plugins/darwin/virtualization.rb @@ -77,15 +77,14 @@ Ohai.plugin(:Virtualization) do virtualization[:systems][:vmware] = "guest" end - if ioreg_exists? && /pci1ab8,4000/.match?(shell_out("ioreg -l").stdout) virtualization[:system] = "parallels" virtualization[:role] = "guest" virtualization[:systems][:parallels] = "guest" - elsif prlctl_exists? + elsif prlctl_exists? virtualization[:system] = "parallels" virtualization[:role] = "host" virtualization[:systems][:parallels] = "host" end end -end +end
\ No newline at end of file diff --git a/spec/unit/plugins/darwin/virtualization_spec.rb b/spec/unit/plugins/darwin/virtualization_spec.rb index 4175d2e1..845d47f9 100644 --- a/spec/unit/plugins/darwin/virtualization_spec.rb +++ b/spec/unit/plugins/darwin/virtualization_spec.rb @@ -151,7 +151,7 @@ describe Ohai::System, "Darwin virtualization platform" do expect(plugin[:virtualization][:role]).to eq("guest") expect(plugin[:virtualization][:systems][:parallels]).to eq("guest") end - + it "sets parallels host if /usr/local/bin/prlctl exists, /usr/sbin/ioreg exists, and ioreg's output does not contain pci1ab8,4000" do allow(plugin).to receive(:prlctl_exists?).and_return("/usr/local/bin/prlctl") allow(plugin).to receive(:ioreg_exists?).and_return(true) |