diff options
| author | David Salazar <dsalazar@carecloud.com> | 2018-01-10 16:01:59 -0500 |
|---|---|---|
| committer | David Salazar <dsalazar@carecloud.com> | 2018-01-10 16:01:59 -0500 |
| commit | 60e8b6f4ff7f39999131f4e16f20514133e81ff0 (patch) | |
| tree | 5ba9f55c3a65bf533bd3604d17725c74ab210b9a | |
| parent | 710813c3432321de7b92b52ba8a570cbbedba2ac (diff) | |
| download | ohai-60e8b6f4ff7f39999131f4e16f20514133e81ff0.tar.gz | |
(chef/ohai#1110) Fix for issue introduced by docker for mac update.
This fix will loosen the regex matching pattern against the
pattern that the docker for mac update introduced to /proc/self/cgroup.
| -rw-r--r-- | lib/ohai/plugins/linux/virtualization.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ohai/plugins/linux/virtualization.rb b/lib/ohai/plugins/linux/virtualization.rb index f08df6aa..797ea4e5 100644 --- a/lib/ohai/plugins/linux/virtualization.rb +++ b/lib/ohai/plugins/linux/virtualization.rb @@ -180,7 +180,7 @@ Ohai.plugin(:Virtualization) do if File.exist?("/proc/self/cgroup") cgroup_content = File.read("/proc/self/cgroup") if cgroup_content =~ %r{^\d+:[^:]+:/(lxc|docker)/.+$} || - cgroup_content =~ %r{^\d+:[^:]+:/[^/]+/(lxc|docker)-.+$} + cgroup_content =~ %r{^\d+:[^:]+:/[^/]+/(lxc|docker)-?.+$} Ohai::Log.debug("Plugin Virtualization: /proc/self/cgroup indicates #{$1} container. Detecting as #{$1} guest") virtualization[:system] = $1 virtualization[:role] = "guest" |