summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJared Weyer <v-jaredweyer@microsoft.com>2022-12-13 16:21:49 -0800
committerJared Weyer <v-jaredweyer@microsoft.com>2022-12-14 16:26:46 -0800
commit60b26f5f4e3a4f4af28241dba0c0829e6798b2c2 (patch)
tree216f270cb3fdd00f4e69dd3788e4270742ed4f0a
parentb59776be1a66db77473f729132b94085fd8fa49d (diff)
downloadohai-60b26f5f4e3a4f4af28241dba0c0829e6798b2c2.tar.gz
account for situtaion in which parallels is installed on a VM
Signed-off-by: Jared Weyer <v-jaredweyer@microsoft.com>
-rw-r--r--lib/ohai/plugins/darwin/virtualization.rb14
1 files changed, 6 insertions, 8 deletions
diff --git a/lib/ohai/plugins/darwin/virtualization.rb b/lib/ohai/plugins/darwin/virtualization.rb
index ac5a096b..d25f646b 100644
--- a/lib/ohai/plugins/darwin/virtualization.rb
+++ b/lib/ohai/plugins/darwin/virtualization.rb
@@ -77,17 +77,15 @@ Ohai.plugin(:Virtualization) do
virtualization[:systems][:vmware] = "guest"
end
- if prlctl_exists?
+
+ if ioreg_exists? && /pci1ab8,4000/.match?(shell_out("ioreg -l").stdout)
+ virtualization[:system] = "parallels"
+ virtualization[:role] = "guest"
+ virtualization[:systems][:parallels] = "guest"
+ elsif prlctl_exists?
virtualization[:system] = "parallels"
virtualization[:role] = "host"
virtualization[:systems][:parallels] = "host"
- elsif ioreg_exists?
- so = shell_out("ioreg -l")
- if /pci1ab8,4000/.match?(so.stdout)
- virtualization[:system] = "parallels"
- virtualization[:role] = "guest"
- virtualization[:systems][:parallels] = "guest"
- end
end
end
end